Small tweaks
Merge branch 'master' of github.com:zph/zph
Trimming the excess from vim
Merge branch 'master' of github.com:zph/zph