Controllers loading in API.
Reasonable output!
Repl kind of works.
Rename the factories.
Merge branch 'develop' into scarfify

Conflicts:
	api/app/controller/v1/api_controller.coffee
	api/app/controller/v1/key_controller.coffee
	api/app/controller/v1/keyring_controller.coffee
	base/lib/application.coffee
	base/lib/test.coffee
	repl/package.json
Most of the API tests running.
API now scarfified.
Most base tests running.
Base tests running.
Proxy tests running.
Choosing port now a thing again.
Use proper close function on app.
Fix test counts.