updated misc server code
Merge branch 'master' of https://github.com/kevlaria/pebble_server
Minor tweaks