core: remove stray file from block move
wxgui: make dummy set_callback stub in nongl sinks.

Doesn't work, but also doesn't break the code.
Merge branch 'master' into next

Conflicts:
	gr-wxgui/python/fftsink_nongl.py
	gr-wxgui/python/waterfallsink_nongl.py