Refactor/gulp

There is an issue with how marionette is rendering files, I kept getting and error about needing '#welcome' on line 513.