Merge remote-tracking branch 'origin/develop' into feature-rpc
Merge remote-tracking branch 'upstream/develop' into feature-rpc
[RPC #6] Added Base class for services
[RPC #6] Quick hack
[RPC #6] Update parse service
Modified plugin name lookup
Merge branch 'master' into develop
switching to moo
Merge branch 'develop' of https://github.com/IntelliHome/Google-at-Home into feature-rpc
Merge branch 'feature-rpc' into develop
Removed the _plugin call
Merge pull request #14 from dgikiller/develop

Merge JSON RPC into core
updated TODO
Merge branch 'develop'