Merge branch 'master' of github.com:caseymacphee/RPi-HAUS
Merge branch 'master' of github.com:caseymacphee/RPi-HAUS
Merge branch 'master' of github.com:caseymacphee/RPi-HAUS
Adds an api route for devices, no corresponding model
Merges with haus/models
Adds devices API route
Adds a working test of /devices/ route
Cleans up tutorial garbage
Cleans up test model in api app
Merge pull request #7 from jbbrokaw/django-rest-framework

Django rest framework
changing settings
added psycopg2 to requirements
db should be good to go
added back djangorestframework to requirements.txt
made migrations
added unicode names to Device and Atoms