NREL/OpenStudio — pull request #676 by jasondegraw (2013-11-25 21:06:03+00:00)
Title: Minor changes for merge

@macumber Here are the most recent changes. I think I got everything - let me know if I missed anything.