Merge pull request #1 from Jasig/master

dfasdf