Merge branch 'master' of github.com:caseymacphee/RPi-HAUS into backbone-models
Adds backbone updating of device/atom display
Merge branch 'django-rest-framework' of github.com:caseymacphee/RPi-HAUS into backbone-models
Merge branch 'master' of https://github.com/caseymacphee/RPi-HAUS
Merge pull request #10 from caseymacphee/models

user/name unique for device
Merge pull request #11 from caseymacphee/django-rest-framework

Django rest framework
Merge branch 'master' of github.com:caseymacphee/RPi-HAUS into backbone-models
Merge pull request #12 from jbbrokaw/backbone-models

Backbone models
Corrected another model reference
Merge branch 'master' of https://github.com/caseymacphee/RPi-HAUS into django-rest-framework
n/t
Merge branch 'master' of https://github.com/caseymacphee/RPi-HAUS
Merge branch 'django-rest-framework'
Added comments to explain API's data upload format