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

Conflicts:
	gulpfile.js
	package.json
Fixes issues with gulp compilation
Adds bundle update rake task
updates gems
Implements sched.org integration
Merge branch 'master' of github.com:StartupWeekend/startup-week-base

Conflicts:
	_assets/javascripts/up-jslib
	gulpfile.js
	package.json
Updates gems
Merge branch 'master' of github.com:StartupWeekend/startup-week-base
Merge branch 'master' of github.com:StartupWeekend/startup-week-city-template