Merge pull request #203 from jasobrown/master

NFSP changes (forward port); write auth classes to yaml

reviewed by sloke and mdo
simple update to trigger cloudbees CI build