Bump to version 1.0.5
Merge branch 'release-1.0.5'

Also, starting with the "new" method of branching.

Details found here:
http://nvie.com/posts/a-successful-git-branching-model/