edits in two places..
Merge branch 'central-arch' of https://github.com/adminion/adminion into central-arch

Conflicts:
	lib/http.js
	lib/index.js