Added disabling of emergency
Merge branch 'master' of github.com:joewarren/nodecopter-berlin