Merge branch 'master' of github.com:b-ryan/dotfiles
Merge branch 'master' of github.com:b-ryan/dotfiles
more php snippets
stashed indicator to ps1
Merge branch 'master' into necromancer

Conflicts:
	xmonad/xmonad.hs
Merge branch 'necromancer' of github.com:b-ryan/dotfiles into necromancer