BF: crash if first line of a conditions file was a float and others were int
FF: importConditions test had failed due to caps being incorrect
changelog updated

* Modified changelog.txt:

- added two extra changes to psychopy change list
> PsychoPy2 IDE stops iohub process when script is terminated by user.
> Optional filtering of mouse and keyboard events to only those targeted
at PsychoPy Window. Windows and Linux support only at this time.

- modified textbox comments to reflect current state of code.

* Copied the changed .txt contents to the .rst file (I hope this is how
you do it).

BTW, could the contents of the txt be imported into the rst using a
sphinx command? Then the change log would only need to be updated in one
place.
Merge pull request #437 from isolver/master

changelog updated
DOCS: v minor change to changelog
BF: removed some prints
BF: OS X crash from (non functional) win filter
Merge pull request #439 from isolver/master

BF: removed some prints
BF: staircase loops in builder were not using the min/max value settings
TESTS: further checks of optional dependencies (for jwp only)
TESTS: code clean-up for test_fitFunctions
ENH: Set volume in MovieStim (useful to mute sound by using volume=0)
Merge pull request #440 from frankpapenmeier/master

ENH: Set volume in MovieStim (useful to mute sound by using volume=0)
Merge branch 'master' of github.com:psychopy/psychopy
DOCS: updated changelog. Removed eyetracker component from Builder for release
FF: reinstated use of `guess` for curvefit
ENH: TextBox stim

* Added 2 methods to TextBox class:
+getTextGridCellPlacement(): return a numpy array giving the pos, width,
and         height of each textgrid cell inthe Textbox.
+ getGlyphPositionForTextIndex(i): return the bounding box for the text
character at index i within the text displayed. This is != to the
textgrid cell the char is in, instead is the bounding box of the draw
glyph itself.

* Changed examples:

- simple_textbox: straight forward TextBox use, showing 2 different uses
of common params.
- textbox_glypth_placement: displays the mouse cursor with the current
mouse x,y window position (in monitor units), useful for checking the
accuracy of the
information returned by getGlyphPositionForTextIndex()
- textstim_vs_textbox.py: test different timing conditions for the
TextBox and TextStim, allowing a user to check what performance (and
differences) to expect with the two text stim types with a string of a
specified length.
TESTS: fix to the test of ipython import
BF: iohub Touch Device OS X fixes.

+ some general usability fixes in the touch device demo.
Merge branch 'master' of git://github.com/psychopy/psychopy