Make git merge --no-ff the default
Add julia-vim
Add format options for pull request