Bring in changes before 1.0.5
Merge pull request #4 from WebFilings/jon/modulePrep

Bring in changes before 1.0.5