Updated barrel cortex example for new clock system
Reduce the number of resolution conflict warnings. Closes #310
Merge pull request #331 from brian-team/pass_down_user_code

Reduce the number of resolution conflict warnings
Merge remote-tracking branch 'origin/master' into cython_codegen2

Conflicts:
	brian2/tests/test_neurongroup.py
Long testing on travis