added location type to JSON for #61
Added will message for #66
Merge branch 'master' of github.com:binarybucks/mqttitude