Towards 0.2.0

Completed work on 0.2.0, moving to master.