Update ssh/known_hosts
Merge branch 'master' of git://github.com/tombamford/puppet
Update ssh/known_hosts
Split various workstation-type roles, attempt custom fact, stop trying broken Adobe Reader
Merge branch 'master' of github.com:tombamford/puppet