alias phpunit to p
Merge branch 'master' of github.com:cjwfuller/nix-profile

Conflicts:
	.zshrc