replaced collimator by hps_collimator
Merge pull request #12 from levon-hakobyan/master

replaced collimator by hps_collimator
Merge branch 'levon-merge' of https://github.com/wmoore28/epics into hotfix-v0.2.4