DOCS: update to credits and to *latest release* section
DOC: fix for val2array.
ENH: _setWithOperation now handles power and modulus.
And made it a bit nicer to read.
DOC: couldn't spell deprecated. Now I can.
Merge branch 'master' of github.com:psychopy/psychopy
RF+ENH: made visual.Window.getActualFrameRate() public and added an option to control precision.
NF: ioLabs buttonbox Builder component
DOC: revert line endings in changelog.rst

(no content added)
DOCS: ioLabs button box component

the API is not finding the module, hmmm
RF: fix some var names to be camelCase in experiment.py; docstrings

minor RF & doc fixes in Namespace
makeValid - remove add_to_space option (was unused)
Merge branch 'master' of git://github.com/psychopy/psychopy

# By Jon Peirce (6) and Jonathan Peirce (4)
# Via Jon Peirce (1) and Jonathan Peirce (1)
* 'master' of git://github.com/psychopy/psychopy:
  TESTS: sitll hadn't made the threshold relaxed enough to pass on the travis box
  TESTS: new error introduced in test suite
  tests: radialstim on linux is now effectively set to xfail (very low thresh)
  ENH: App does not redirect stderr/stdout during tests (using arg commandline arg testMode)
  ENH: trying some changes to app quit(), partly to quit in a more resilient way
  TESTS: further psychopy.visual testing
  ENH: test_fitFunctions shouldn't be plotting for automated tests
  ENH: fixed the visual test bugs caused by new attribute setters
  ENH: a bugfix to val2array to handle single-val cases better
  RF: data fitting functions now using least-squares instead of minimisation

Conflicts:
	docs/source/changelog.rst
  --> changelog conflict resolved by selecting upstream. mergetool prompted
      for what line-ending to use since the files differed.
Merge remote branch 'jonas/master'

Conflicts:
  psychopy/visual.py:
    - jonas had moved getattr(self, attrib) to store a temp attribute `oldval` but not faster (slower?)
RF: iolab import from Builder component

- circular imports if hardware.__init__.py imports iolab.py
- the generated Builder code is not ideal, in that not all imports are
  at the top, but requiredLibs() does not have a provision for
  "from psychopy.XYZ import abc"
Merge pull request #365 from jeremygray/master

ioLab System buttonbox component for Builder
Merge branch 'master' of github.com:psychopy/psychopy