Update a few things
Merge branch 'master' of github.com:watershedlegal/legalcms