restful updates
Merge branch 'master' of https://github.com/tylerdmace/kindling

Conflicts:
	server.js