Bump version to 2.1.5
Merge branch 'master' of github.com:brandur/org