Adds Chris Neugebauer.
Merge remote-tracking branch 'pyconca/chris-neugebauer' into pyconca2013