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

1079 by William Grant
Merge setup-refactor branch. This completely breaks existing installations;
1
trampoline : trampoline.o norm.o
2
trampoline.o : trampoline.c norm.h conf.h
3
norm.o : norm.c