Squashed commit of the following:

commit 063f73f2482c911b26bf151c90fce433db5d7741
Merge: 241b2df 810ea57
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Wed Apr 23 12:38:54 2014 -0400

    Merge remote-tracking branch 'vispy/master' into paint_to_draw

    Conflicts:
    	examples/howto/display-lines.py
    	examples/howto/display-shape.py
    	examples/howto/rotate-cube.py
    	examples/howto/start.py

commit 241b2dfe69fc47cb97ea50042dd37b4d77f1ee91
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Wed Apr 23 12:02:33 2014 -0400

    paint => draw in doc/ and examples/

commit 8a73b8e4594c1149e82335296903f3962fc3384c
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Wed Apr 23 09:28:18 2014 -0400

    style

commit ab79ff377166b6a8cd091361051ae71eb4ce7722
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Wed Apr 23 09:25:37 2014 -0400

    Replace Paint with Draw

commit f7583dc4a3102f6c6e353c47968d554cc18e9233
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Wed Apr 23 07:43:14 2014 -0400

    Replaced all occurrences of 'paint' with 'draw'