Let's merge dev to master

We've been in maintenance mode on dev for a while now. Merging readme changes and gemfile hotfixes to master is a pain. And we've been sitting on a few bug fixes and features anyway. Let's review/merge the dev branch one last time and release 0.4.0. Then we can maintain master until we release the clean slate.