Various improvements.
See for yourself ;-P
Merge branch 'linux' of github.com:louismunro/configfiles into linux