Merge conflict
Merge pull request #317 from calblueprint/revert-ssl

remove-ssl