Merge develop into master

Prepare for release and deploy of 0.3

/cc @calebsmith