Squashed all of the api commits so far

Conflicts:
	config/routes.rb
	public/api-browser