fml
Merge branch 'master' of github.com:pgollucci/oh-my-zsh

Conflicts:
	custom/p6rwsxterm.zsh