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 github.com:caseymacphee/RPi-HAUS into backbone-models
Merge pull request #12 from jbbrokaw/backbone-models

Backbone models