rename variables, remove unused code
modify include
Merge branch 'master' of github.com:sboysel/dotfiles