Fixes IFs and OSX-only include file.
Add git aliases: go, d(iff).
Fix comparisom for phpenv.
Merge branch 'master' of git://github.com/augustohp/warwick

Conflicts:
	home/.bash_profile