Undoing bad change I put in earlier which breaks everyone's development envirnoment, now of course the dev server will be busted, but I'll fix that manually.
Merge branch 'master' of http://github.com/CruGlobal/conf-registration-api