Merge pull request #41 from rhayes-cida/master

Changes to make site work on Bryan's workstation
Merge pull request #42 from rhayes-cida/master

A couple small fixes.