BF: fixed the long-standing bug with scrolling on the Routine Panel under win32
TESTS: minor change to use GratingStim not PatchStim (latter is deprecated)
FF: the new prettier printing of visual objects is slow. Don't use for logging except init

Moved the pretty/informative version to __str__ from __repr__ so that
repr() stays fast on logging updates

During creation of the stimuli it seems reasonable to use slower str() method
Merge branch 'master' of github.com:peircej/psychopy

Conflicts:
	psychopy/app/builder/builder.py
DOC: update copyright year -> 2014
RF: remove opensslwrap.py

superceded by pyfilesec
Merge pull request #468 from jeremygray/copyright-2014

DOC: update copyright year -> 2014
Merge branch 'master' of git://github.com/psychopy/psychopy

* 'master' of git://github.com/psychopy/psychopy:
  DOC: update copyright year -> 2014
DOC: encryption.rst now points to pyFileSec docs
DOC: gui.Dlg doc-strings

thanks to Jürgen Kurzmann
DOC: point to coder demo for encryption
Merge pull request #469 from jeremygray/master

remove opensslwrap; tweak some docs
ENH: tweak keyboard component deault duration

- typically want keypress to end routine, not last for 1s, so set default duration = empty
BF: KeyComp: 'escape' works with empty Allowed Keys; closes #467

- fix case in which empty -> any key -> slurp up 'escape' -> not detected

Notes:
- arbitrary events could escape/quit very easily, just set endExpNow = True
FF: escape now works even if no keyboard component

also minor tweaks to keyboard.py
RF: remove redundant 'escape' from ratingscale component

should be handled by outer loop
Merge pull request #470 from jeremygray/master

Keyboard component 'escape', default duration
ENH: allow control over height of RatingScale tickmarks

and tweak some doc-strings
FF: simplified 916ac6c81aa

During experiment.py we don't need to do a second event.getKeys()
ESCAPE="escape" in constants is unecessary complication
ENH: simpler doc & code for tickmark height in RatingScale

ticksAboveLine: document as numeric; support boolean for backwards compat.