added Martin's keys to gconf
Merge branch 'master' of https://github.com/walterbender/training