Bump version
Update docs to bootstrap 3
Merge branch 'master' into cffi