Remove build folder from gitignore
Merge branch 'master' into macosx