Stopped using begin in is_daemon_running method - that was bad - closes #318 and closes #340
Merge branch 'master' of github.com:concerto/concerto

* 'master' of github.com:concerto/concerto:
  Account management cleanup