Merge branch 'landing-page' of https://github.com/Thinkful/pysplash into landing-page

Conflicts:
	cache/css/register.css
	cache/css/splash.css
recompiled css
added an overview to the fewd course
fixed a bug where aliased emails were not allowed
Merge branch 'master' into new-syllabus
Merge branch 'master' of https://github.com/Thinkful/pysplash
Merge branch 'master' of https://github.com/Thinkful/pysplash
changed name of course to Programming in Python
Merge branch 'landing-page' of https://github.com/Thinkful/pysplash into landing-page
Merge branch 'master' into landing-page