Add Make.user to .gitignore
Merge branch 'master' of github.com:JuliaLang/julia