Merge branch 'master' of https://github.com/jjw/local-libs
Update .gitignore