Update g.fish
Update g.fish
Update g.fish
Merge branch 'master' of https://source.xing.com/felix-hamann/dotfiles
added bundle exec and rails shortcuts
fixed some backup issue
Merge branch 'master' of https://github.com/dreadworks/dotfiles

Conflicts:
	install.fish
prompt changes based on whether the cd is a git repo
added possibility to just invoke `bundle exec rake` as `be r`
fixed bug where arguments are not passed accordingly