Tweaking various things which were highlighted as todo, eliminating some small resource bugs, commiting before large changes are made to resources
Merge branch 'update-mail' of github.com:markfeedly/social-museum into update-mail