Merge branch 'master' of github.com:curipha/dotfiles
Remove 'g' option from guioptions since it already has no menu