new file: osx.sh!
Merge branch 'master' of https://github.com/akshaym/dotfiles

Conflicts:
	vimrc