gitignore changes
include marionette js
re-organise grunt build dir
edits