Ditched MacPorts in favour of Homebrew!
Updated $EDITOR to use /usr/bin/env to find vim.
Merge branch 'master' into mac

Conflicts:
	profile