subl plugin updated to correct path
Semi-customized fish_title function; should probably do more with it?
Merge branch 'master' of github.com:rykugur/oh-my-fish

Conflicts:
	functions/fish_title.fish
i3 exit function