Some error handling
Cleaned up routes, changed SOME controllers accordingly
Merge branch 'master' of https://github.com/gattik/smartprovider