Final tweaks so I can go home
Merge branch 'master' of https://github.com/stephenrouse/heidi