I'd use something like Grunt (https://github.com/cowboy/grunt) as a way to minify & concatenate your files for deployment.

That way, you can work with a file formatted to your liking, but when deployed, it will be optimized.