Manual updates for the 0.10 release.
Merge branch 'master' of /Users/seang/code/Fiona