Fixed gulp build system once and for all, added bower
Removed dist folder from git and fixed merge conflict