Merge tag 'v0.2.1'

@iros I'm opening this to troubleshoot TravisCI integration, but I'll merge it from the command line when things are safe (merging via GitHub would result in a merge commit of a merge commit, which is just silly).