* added Xresources.linux
* added new commits from tmux-powerline
Merge branch 'master' of http://github.com/vbajpai/dotfiles