updated .osx for my settings
Merge branch 'master' of https://github.com/pdaugavietis/osx-dotfiles

Conflicts:
	.osx