Merge pull request #2971 from eileenmcnaughton/Cleanups
authorEileen McNaughton <eileen@mcnaughty.com>
Mon, 28 Apr 2014 00:45:14 +0000 (17:45 -0700)
committerEileen McNaughton <eileen@mcnaughty.com>
Mon, 28 Apr 2014 00:45:14 +0000 (17:45 -0700)
Cleanups this includes setup to allow unit tests (not in this PR) to run


Trivial merge