changes and stuff
Merge branch 'master' of https://github.com/sorin-ionescu/prezto

Conflicts:
	runcoms/zpreztorc
added my theme
changed modules