update 20141024
Merge branch 'master' of github.com:vladsadovsky/dotfiles