Cool :)

Feel free to review, but let's wait to merge anything into 0.10 until after Monday's dev meeting.  Sounds good?