.
Merge branch 'master' of https://github.com/brynedwards/dotfiles

Conflicts:
	store.gpg