Minor last minute changes
Merge branch 'master' of https://github.com/ResearchComputing/meetup_fall_2014