Merge branch 'master' into dhalperi-add-flake8-v2

Conflicts:
	raco/clang.py
	raco/clangcommon.py
	raco/grappalang.py
	raco/pipelines.py