Add awesomewm config
Merge branch 'master' of github.com:chomik/dotfiles
Resolve conflicts in vimrc