~azzar1/unity/add-show-desktop-key

1079 by William Grant
Merge setup-refactor branch. This completely breaks existing installations;
1
# Allow conf.py to be imported without importing conf.conf
2
3
from conf import *