more cleanup
Merge branch 'master' of github.com:ganchenkor/marionette-browserify