laaaaaaaa
Merge branch 'master' of chili:qgic-2013
FUCK
FUCK
FUCK
FUCK
I'M stupid.
fix some final pre-launch stuff
Merge branch 'master' of github.com:uniphil/qgic-2013