Merge branch 'develop' into remodel
Initial commit of SWIG work

It compiles, but not very well. There are also a number of issues
with constructors. RunControl is a problem and will need some
work.
Fix GCC gripes about ambiguous overloads
Minor changes, fails to link on Windows
Merge branch 'swig_contam' of github.com:jasondegraw/OpenStudio into swig_contam
Fix linker errors by adding missing CONTAM_API macro
Merge branch 'swig_contam' of github.com:jasondegraw/OpenStudio into swig_contam
Update openstudio.rb to include CONTAM library

This pretty much wraps up the SWIG work for the time being. Once
the object cleanup work is done, then this branch will get merged
in.
Merge remote-tracking branch 'origin/swig_contam' into work_for_merge

Conflicts:
	openstudiocore/src/contam/ForwardTranslator.cpp
	openstudiocore/src/contam/PrjModel.cpp
	openstudiocore/src/contam/PrjModel.hpp
	openstudiocore/src/contam/PrjPublic.cpp
	openstudiocore/src/contam/PrjReader.cpp
	openstudiocore/src/contam/PrjReader.hpp

Most of the larger conflicts had to do with changes made to make
the SWIG-based interface more uniform. Testing will be needed to
make sure that everything has come through Ok.