gitignore: git now ignores the build/ directory
Merge remote-tracking branch 'bhilburn/gitignore_fix'
Merge branch 'master' into next