Initial commit
Merge branch 'master' of https://github.com/nicksen/osx_dotfiles

Conflicts:
	README.md
Merge branch 'develop'