update 10July 2014
Merge branch 'master' of github.com:ka4tik/dotfiles