Merge branch 'master' of github.com:StartupWeekend/startup-week-base into upstream
Removes google analytics include
Adds Salesfusion tracking snippet
Merge branch 'master' of github.com:StartupWeekend/startup-week-base

Conflicts:
	app/views/pages/index.liquid
	app/views/snippets/google_analytics.liquid
	app/views/snippets/scripts.liquid
Merge branch 'master' of github.com:StartupWeekend/startup-week-city-template into upstream
Initial site configuration