Initial reordering of server.js filetype handlers
Merge branch 'master' into apache-like-file-handling

Conflicts:
	server.js
The node server now behaves more naturally, the view & static file handler are now combined, and they serve from the src/ directory.
Fixed the broken grunt build, it now handles the new views format correctly.