Removed legacy tests, and moved api/controllers to api/routes

The app/api folder was there for test purposes, but is no longer needed, as a PHP powered RESTful API is currently serving the test data.  I've moved api/controllers to api/routes as its more symantically correct.  The files in api/controllers (now api/routes) don't controll any views...etc.
Forgot to git -rm -r the controllers. Silly me
Merge remote-tracking branch 'upstream/master'

Upstream added a few lines to config details
Merge pull request #5 from cobookman/master

Symantic changes