Add --no-commit and --no-ff to mergeoptions
Merge branch 'master' of github.com:EnTeQuAk/dotfiles
Add Monokai Extended package