Fixed merge garbage.
Merge branch 'master' of github.com:gitoffourlawn/daemondash