Merge branch 'master' of github.com:telegraphic/hipsr_server

Signed-off-by: Danny Price <dan@thetelegraphic.com>
Merge branch 'master' of github.com:telegraphic/hipsr_server