Revert "Merge branch 'master' into 'master'"

This reverts merge request !54 (merged)

cc @austinpray I will be reverting your big MR until a few bigger things are working so it doesn't slow down development. see issues including #91 (closed)