Merge branch 'master' of https://github.com/calblueprint/BPSF
Merge branch 'master' of https://github.com/calblueprint/BPSF into admin-add-other-toggle-links
Add tests for other grant toggles
Fix bug
Merge pull request #37 from calblueprint/add-tests-for-other-grant-fields

Add tests for other grant fields