initial code
mac specific changes
Merge branch 'master' of github.com:andeee/dotfiles

Conflicts:
	.emacs