code layout cleanup
Merge branch 'master' of https://github.com/patrickmcsweeney/syllabalastic

Conflicts:
	http_routes.php