Simplified scripts.
Merge branch 'master' of http://www.github.com/ronno/dotfiles