Merge pull request #87 from openplans/staging

0.4.3