changed ruby version
added heroku again and changed preferred ruby version to 1.9.3-p448
fixed cdhw function in bash_profile to still work when no arguments are given--the function remains commented out, tho
merged mac_os
fixed typo