Cleaning up the code

Change-Id: I532a07c2a34b76145d1bc0d6e1a11a471a49f817
Merge branch 'master' of github.com:oneself/oh-my-fish

Conflicts:
	themes/oneself/fish_right_prompt.fish

Change-Id: I05c7e7bd46ac25b50c70b3e13f3c964f98fe6bba