Updated dotfiles. Added a few new features
Merge branch 'work'