Fix bad right prompt placing.
Update git.plugin.zsh
escape dashes
Merge pull request #2396 from soluwalana/master

Fix WIP false positive
Fixes tmuxinator plugin find on OSX
Merge pull request #2398 from phstc/fixes-tmuxinator-plugin-find

Fixes tmuxinator plugin `find` on OSX
Merge pull request #2389 from driver2000/patch-1

Fix bad right prompt placing.
'lsa' alias changed to 'la' same as bash alias
Added refreshing of new commands
My own theme, combination of my old bash prompt and new option for git statuses.
add color to ls
added/remove aliasses
disabled some git aliases, because they conflict with the bookmark function
added custom bashmarks plugin
added time on the right side of the commandprompt
Merge branch 'master' of github.com:harrykroon/oh-my-zsh

Conflicts:
	themes/harry.zsh-theme