Unbreak bad html.
Merge pull request #1 from angelaharms/master

Fix typos in April & Jerry's
Merge pull request #2 from magnusstahre/unbreak

Unbreak bad html.
Adding info for Terry Wiegmann
[#3] Added redirect for no subdomain, to avoid duplicate content penalty
[#3] Added robots.txt to explicitly allow all crawlers to crawl all areas of the site
[#3] Added meta description
Merge pull request #5 from dtrenz/basic-seo

Basic seo
Speaker nav menu
ordering by name properly
Throwing a ruby backend on this b
Getting rid of angular
adding a config
Merge pull request #6 from crebma/rubying

Rubying
Merging master
Adding speaker nav
Merge branch 'master' into speaker-nav

Conflicts:
	public/js/speakers.js
	views/layout.erb
	views/speakers.erb
Merge pull request #7 from crebma/speaker-nav

Speaker nav
pushing around the speaker nav a bit
Adding paradalis labs as a sponsor