fixed lost task
added history search
Merge branch 'master' of github.com:pfarrell/dotfiles

Conflicts:
	Rakefile