slac-rebase-170804

John Tourtellott

@john.tourtellott

b9ed7155 · Fix compile errors in rebase · Aug 04, 2017

Rebase to latest cmb-superbuild:master (now Qt5 and pybind11)