Cleaning up the dotfiles

- Removing some OSX only functions
- Misc fixes