add back kpk setup, as a fork
minor fix: executable script, path to script
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
add link_desktop and checkgmail_username to fork-kpk-common.bash
Merge remote-tracking branch 'upstream/master'
add gnome3 and xfce fork-specific settings
Merge remote-tracking branch 'upstream/master'
Merge branch 'backports'
move fork-kpk-common.bash to common.bash
Merge branch 'backports'
Merge remote-tracking branch 'upstream/master'
ssh keys, extra bashrc
Merge branch 'backports'
ubuntu 13.04 background
tomcat/app symlinks
tomcat setenv.sh
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'