updates from the 04/16 call
Merge branch 'master' of https://github.com/ciferproject/cifer
updates from the 4/16 call