Merge remote-tracking branch 'Kynde/master' (#34)

Conflicts:
	gitstatus.py
	zshrc.sh
simplify installation (#39,#43)

the script now automatically finds the executable (i.e, the Python file), by assuming it is in the same directory
this should work even if the script is symbolically linked
Merge remote-tracking branch 'upstream/master'

Conflicts:
	zshrc.sh