Merge pull request #10 from ga-instructors/master

localized a few things for the april 14 classes
Merge pull request #11 from ga-instructors/master

mac_os merging
add pre-commit hook
Hack pre-commit hook to allow for project week

This pretty ugly hack allows, in fact, any wXX/STUDENT_NAME directory.
Possible better fix: determine which weeks will be project weeks and
only allow for those weeks. Still - a good enough start, since students
are unlikely to create a directory with their name up there.
updated to ruby 2.1.2
updated checks to use global ruby version
update terminal command to point to this repo
updated scripts, removed subl, added atom, added homebrew cask for GUI app install
resolved conflicts
merged mac_os