Fix GCC gripes about ambiguous overloads
Merge branch 'swig_contam' of github.com:jasondegraw/OpenStudio into swig_contam
Merge branch 'swig_contam' of github.com:jasondegraw/OpenStudio into swig_contam