git aliases for vimdiff
Merge branch 'master' of git://github.com/tombamford/puppet
Update ssh/known_hosts
OpenLDAP and OpenSSL installation and preferences