fix colors a bit
add default push method 'simple'
Merge branch 'master' of https://github.com/josepht/home