Fixes needed to get our Jenkins job running
Merge pull request #31 from daviddavis/temp/20140122163759

Fixes needed to get our Jenkins job running