Merge branch 'master' of https://github.com/mishto/hubtitude

Conflicts:
	hubtitude/test_utils.py
pb updated