Begin merging the API project

Conflicts:
	Gemfile
	Gemfile.lock
More work on getting the API into the main repo

Conflicts:
	Gemfile
	Gemfile.lock