Merge branch 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile