merge of second repo
Merge branch 'master' of http://github.com/vamitrou/dotfiles