More require cleaning
Merge pull request #95 from daviddavis/temp/20140304102536

More require cleaning