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

replaced collimator by hps_collimator
Added testbuild.sh for testing various makefile options
Added stripped down (t)csh file for setting env variables
apps gitignore for app symlinks used to fake out old medm screens
Merge branch 'levon-merge' of https://github.com/wmoore28/epics into hotfix-v0.2.4
Added updated scaler_hps.adl from stepanya
Updated version of harp_analyzer
Added symlink for correct version of bta_config_rc.pl