support for better profiling
Merge remote-tracking branch 'upstream/master'

Conflicts:
	nengo_ocl/plan.py
	nengo_ocl/sim_npy.py