Bug #257: Fix link in README file
Merge pull request #261 from kristenfaulkner/master

Bug #257: Fix README link
Merge pull request #260 from jeremygray/master

DOC typo; RatingScale.history
DOCS: sphinx formatting corrections
Merge branch 'master' of github.com:psychopy/psychopy
Merge pull request #266 from jeremygray/master

sysInfo.py print some path info; and a mouse helper function
BF: add 'height' to list of selectable units in prefs and exp settings