adding validations
fixing houndci comments
fixing merge conflicts
Merge pull request #98 from calblueprint/alli/validations

adding validations