Update to v2014-0629

And add a .gitignore file for good measure
Merge branch 'master' into fonts