Move routes into lib & cleanup requires
Use dashes consistently in file names
Move views & refactor email template loading
Fix build page margins
Fix route requires in new location
cleanup plugin template
Merge branch 'master' into routes

Conflicts:
	package.json
Merge branch 'routes' into 1.6.0-pre.2