Clean up merge conflict
Merge pull request #21 from davegw/api_routes

Clean up merge conflict