Fix 'git completion' error using things I found on the internet.
Add gitflow aliases.
Fix bug in git flow aliases.
Tweak git aliases.
Update PHP snippets, based on usage.
Merge branch 'develop'