.emacs.d: change mac-win keyboard swapping function to set up Control and Alt to the left and right of space.
Merge remote-tracking branch 'origin/master' - forgot to pull before making changes.
bash: Move $PATH stuff from .bashrc to .bash_profile.
.bashrc: Add OS-check and ls, grep aliases for OS X.