Done some major changes to the server
Merge branch 'master' of https://github.com/couchtape/couchtapeapp

Conflicts:
	app.js
Cleanup
Edited the docs