Rename pre_run and post_run to before_run and after_run. Closes #85
Merge remote-tracking branch 'origin/master' into finalize_functions

Conflicts:
	brian2/monitors/ratemonitor.py
	brian2/synapses/synapses.py