Merge branch 'ucsf/develop' of github.com:Trott/mwf into ucsf/develop
rm dead code
Test for display of library hours
Display hours
Merge branch 'ucsf/develop' into ucsf/master