Merge branch 'master' of github.com:caseymacphee/RPi-HAUS
changing settings
added psycopg2 to requirements
Merge pull request #8 from markableidinger/master

adds css and HTML mockups of login page and data display
Merge branch 'master' of github.com:caseymacphee/RPi-HAUS into backbone-models
db should be good to go
added back djangorestframework to requirements.txt
made migrations
added unicode names to Device and Atoms
Merge branch 'master' into models

merged with most recent upstream master

NOTE default datetime is stored in the following format:
 datetime.datetime(2014, 11, 25, 19, 0, 8, 481812, tzinfo=<UTC>)

this likely needs changing.
Added DeviceDetailView, began work on posting thru API
Adds a little backbone to it
Merges with updated models
Merge pull request #9 from caseymacphee/backbone-models

Backbone models
Merge branch 'master' of github.com:caseymacphee/RPi-HAUS into backbone-models
Added post support example code to API for devices
Merge branch 'master' of https://github.com/caseymacphee/RPi-HAUS into django-rest-framework
Adds backbone updating of device/atom display
user/name unique for device
Implemented device database updating through API