Fixed my bugs, yaaaaay.
Merge branch 'master' of github.com:gitoffourlawn/daemondash
Merge branch 'master' of github.com:gitoffourlawn/daemondash