Removed conque shell
Merge branch 'master' of https://github.com/lechat/dotfiles
Added trimwhitespace to yaml files