Worked on #96, #98
derp
Merge branch 'master' of github.com:binarybucks/mqttitude