Added .profile.d.local stuff to .profile.
Merge branch 'master' of github.com:willvousden/shell
Merge branch 'master' into mac