Update for release 0.2

Merge in all of the changes from the experimental branch! Yay for fun code!