press update and news changes
fixed merge conflicts
Merge pull request #83 from calblueprint/cleanup

Cleanup