gists and priv bundle
Merge branch 'master' of github.com:akerl/dotfiles

Conflicts:
	.bundles/mac