Updated submodule reference
Suppress bogus Numpy 1.7 API deprecation warnings from weave; fixes #559
Updated submodule reference
Added holoviews submodule reference
Merge branch 'master' into holoviews_refactor

Conflicts:
	.gitmodules
	external/holoviews