ctrlport: fixing up controlport integration into gnuradio-core for merge with next.
ctrlport: gets rid of a SWIG warning.
Merge branch 'master' into next
qtgui: Python.h must be included first (it's even in the Python documentation) to avoid warnings.
ctrlport: ControlPort requires SWIG 2.0, so we check for that here; everywhere else still uses 1.3.31 min.
ctrlport: cleaning up contorlport builds.

I was getting confused with where ENABLE_GR_CTRLPORT was used, so this uses that in cmake and GR_CTRLPORT for the C++ and Swig files.
Merge branch 'next-ctrlport' into next
Merge branch 'master' into next
Merge branch 'next' of gnuradio.org:gnuradio into next
ctrlport: forgot a check in the Python dirs for controlport.
Merge branch 'master' into next
ctrlport: using execute_process instead of add_custom_command for Python slice files.

There were some race issues with the previous way. Doing it this way makes sure that the x_ice.py files are there when they need to be.
ctrlport: fix in cmake for OSX builds of ctrlport.
Merge branch 'master' into next
Merge branch 'master' into next
Merge branch 'master' into next

Conflicts:
	gnuradio-core/src/lib/runtime/gr_basic_block.h
core: fix missing gr_basic_block variable after merge fixup
build: fixes to build with PMTs and ControlPort.
Merge branch 'master' into next

Conflicts:
	gnuradio-core/src/python/gnuradio/gr/hier_block2.py
Merge branch 'master' into next

Conflicts:
	gr-analog/examples/tags/CMakeLists.txt