Removing modernizr until we need it. Closes #149
Merge branch 'develop'