Merge upstream20140822

Includes fixes for the failing tests in:

https://github.com/wamuseum/providence/pull/104