tests: fixed one of the seg faults in tests (caused by pygame)
app: improved splash screen but breaks unit tests
app: trying to add a showSplash=True arg to app to get around test crashes

but it still doesn't seem to help!!
open conditions file: better warnings

not yet tested for .xlsx
Merge branch 'master' of git://github.com/psychopy/psychopy

* 'master' of git://github.com/psychopy/psychopy:
  Revert "lib: converted ElementArray vertices into float32 from double"
  changelog
  lib: limit number of dropped-frame and image-resize warning messages
  docs
  builder: fixed problem with loops not showing up if conditions file wasn't found
BufferImageStim: clean up a) depth (not needed) and b) GL-version test
Merge branch 'master' of git://github.com/psychopy/psychopy

* 'master' of git://github.com/psychopy/psychopy:
  version number bump
  lib: if no sound delivery was possible pyglet would fail to import
  lib: fixed elementarrays for older nvidia cards under win/linux
testApp: fix a test to reflect current code
Merge branch 'master' of git://github.com/psychopy/psychopy

* 'master' of git://github.com/psychopy/psychopy:
  Properly flush mouseButton presses
  Added Polygon, Line, Circle and Rect classes to draw simple shapes, builder components yet do be done.
  Patched ShapeStim to respect size attribute and setSize, see issue 80
  lib: ElementArrayStim fieldshape could be 'square' or 'sqr'
  prefs: reapplied the code to allow custom path to be appended using prefs
  builder: further potential fix to import of lists/tuples
  builder: fixed bug importing lists of vals [0,0] from conditions files
  lib: gamma.createLinearRamp didn't returned nothing if rampType was not provided
  builder: saving of files with better filename checking
  changelog
merge conflict resolution
Merge pull request #102 from alexholcombe/master

fixing frameIntervals to avoid spuriously long frameIntervals
Merge branch 'master' of git://github.com/psychopy/psychopy

* 'master' of git://github.com/psychopy/psychopy: (29 commits)
  app: internet connections now work through all forms of proxy settings?
  Monitor Center: was confusing the choices of gamma correction method
  builder: mouse component should reset mouse buttons on start
  lib: Window now stores the gamma ramp from before it was created
  monitors: Added CRS ColorCAL mkII support to MonitorCenter
  builder: updated to write code using psychopy.logging instead of psychopy.log
  lib: fix to DotStim when given fieldSize=(1,1) and fieldShape='sqr'
  demos: fix to gammaMotionNull after change to dialog boxes
  lib: improved update speed for TextStim
  lib: psychopy.log -> psychopy.logging
  lib: fix to loggin so that they are written out in the event of a crash
  docs
  docs
  lib: joystick now working on windows
  lib: added visual.openWindows list and added _eventDispatchers list to Window
  lib: added hardware.joystick (pyglet and pygame)
  docs - added timing tests across OS
  docs
  docs
  docs
  ...

Conflicts:
	psychopy/app/builder/builder.py : self.conditions = self.conditionsOrig
Merge branch 'master' of git://github.com/psychopy/psychopy

* 'master' of git://github.com/psychopy/psychopy: (55 commits)
  Changed  recordFrameIntervals so it does not record the interval between turning off recordFrameIntervals and turning it back on
  lib: fix to BufferImageStim for certain forms of OpenGL version messages
  Remove unnecessary dependance on Pyglet
  Ignore OSX Directory Listings
  hardware: fix to Joystick.getHat() (thanks Gary Lupyan)
  docs: changelog and version number
  builder: scripts now silently perform conversion to float during division
  app: fix to allow the 1.73 patch to run on 1.70 binaries (only needed for mac)
  docs
  lib: StairHandler objects weren't unpickling properly
  lib: fix to strange text rendering on some ATI/win32 combinations
  bumped version number
  builder: fixes to dots component
  builder: fix to data saving if conditions==[]
  fixes to MovieStim (probs with builder import order and autodraw needing 'depth')
  Minor change to visual.Rect.setHeight to correct argument name
  docs and gitignore
  docs
  lib: further work to fix avbin import issues on windows
  "raisedCosine" in makeMask now respects center, radius and fringeWidth parameters.
  ...

Conflicts:
	psychopy/visual.py : glversion handling in BufferImageStim
Fix fMRI Emulator Bug for named keys
bugfix: restore hog CPU period in sync emulator

now the fMRI_launchScan.py demo reports times in chunks of 2.000s (== TR)
docs
docs
Merge branch 'master' of github.com:peircej/psychopy

Conflicts:
	docs/source/changelog.rst
docs: don't document inherited methods for bufferImage
Merge branch 'master' of git://github.com/psychopy/psychopy

* 'master' of git://github.com/psychopy/psychopy:
  docs: don't document inherited methods for bufferImage
  docs
  docs