Merge branch '2803-python-package-split-wip'
authorBrett Smith <brett@curoverse.com>
Fri, 9 May 2014 20:51:17 +0000 (16:51 -0400)
committerBrett Smith <brett@curoverse.com>
Fri, 9 May 2014 20:51:35 +0000 (16:51 -0400)
Closes #2803, #2804.


Trivial merge