fixed load problem
ignored eshell history and lastdir
Merge branch 'refs/heads/master' into test-fix

Conflicts:
	ac-comphist.dat
	eshell/history
	eshell/lastdir
	users/dylanconlin/places
ignored places and added cask