folders should not be returned by pexpect.which()
remove all unnecessary imports
rewrite history
Merge pull request #62 from pexpect/pull-37-try-3

folders should not be returned by pexpect.which()
Merge remote-tracking branch 'origin/master' into issue-44-solaris-try-2

Conflicts:
	doc/history.rst
	tests/test_expect.py
	tests/test_replwrap.py