Make sure concatenated files are separated by newlines. Don't specify a type in <script> tags
Merge branch 'master' of https://github.com/potatolondon/assetpipe

Conflicts:
	README.md