add todo.sh config
Merge branch 'master' into everard
fix solarized theme with base16's version
Merge remote-tracking branch 'origin/master' into everard

Conflicts:
	zshenv
add distro specific python version
switch to delimitMate
Merge remote-tracking branch 'origin/master' into everard

Conflicts:
	zshenv