Merges GSB site settings with new settings from base
Double fixes language selector logic
Adds site_url for english language option
Merge branch 'master' of github.com:StartupWeekend/program-site-base
Merge branch 'master' of github.com:StartupWeekend/gsb-2014-wagon

Conflicts:
	config/site.yml