Merge pull request #202 from jasobrown/master

forward-porting items from 1.1 to master
reviewed by sloke and mdo
forward porting NFSP changes
we've got config options for setting auth classes, but forgot to write it out to the yaml.