cleaning up files used by browserify on build
cleaning up merge conflicts
Merge branch 'master' of github.com:JonET/mimosa-browserify