Final integration uncommented
Merge pull request #2 from ghodgins/Integration

Final integration uncommented