updated stuff, bahhh
Merge branch 'master' of https://github.com/purdue-epics-ims/ims2014