Updates uglify version
Fixes gulp sass task
Updates gems
Merge branch 'master' of github.com:StartupWeekend/startup-week-base

Conflicts:
	gulpfile.js
	package.json