Updated settings
Merge branch 'master' of https://github.com/shenoybr/dotfiles

Merging local file with repo