Merge branch 'python' for release 0.1 v0.1
authorEthan White <ethan@weecology.org>
Sat, 2 Aug 2014 19:05:11 +0000 (13:05 -0600)
committerEthan White <ethan@weecology.org>
Sat, 2 Aug 2014 19:05:11 +0000 (13:05 -0600)

Trivial merge