fix improper overwriting of endpoints
Merge branch 'master' of git://github.com/aaroncbader/hsx_bs