Preparing for 3.6.0 release
Merge branch 'master' of github.com:projecthydra/sufia