begin updating .osx for Yosemite

- commented out the -currentHost defaults commands for trackpad behavior since it wasn't working for me

- the new cmd+return Mail shortcut is also a fix for Mavericks (see #381)