FIX: Revert OpenCL changes
FIX: Remove openCL from setup.py
Merge pull request #118 from Eric89GXL/opencl-fixes

FIX: Fixes for OpenCL and new example
STY: Allow newline whitespace
FIX: Ignores
FIX
Merge pull request #119 from Eric89GXL/whitespace

STY: Allow newline whitespace
Add People who made a PR to the contributers section.
Merge branch 'master' of https://github.com/vispy/vispy
Merge remote-tracking branch 'upstream/master'

Conflicts:
	setup.py