fixed and un-nigger-rigged everything
Merge branch 'master' of https://github.com/smogi/janddrecruitment