Fixed a bunch of merge failure.
Merge branch 'master' of github.com:gitoffourlawn/daemondash