Committing collectorAlignment changes
Merge branch 'master' of https://github.com/amccaleb/UCSC-Rover-2014