switching to numpydoc
switching back.
changed 'tricks' to 'behavior' & extended conditions
Merge pull request #54 from neuromusic/tr-conditions

changed 'tricks' to 'behavior' & extended conditions
added cue light support
added cue light support
Merge branch 'dev' of https://github.com/wohlmp/pyoperant into dev

Conflicts:
	.DS_Store
Merge pull request #55 from wohlmp/dev

add cue light support
fixed bug where correction trials were not annotated
Merge pull request #56 from neuromusic/dev

fixed bug where correction trials were not annotated
Merge remote-tracking branch 'upstream/dev' into fresh-docs