Update to Apache Server Configs 2.5.0
Update Modernizr to v2.8.2

Close h5bp/mobile-boilerplate#211.
fixing conflicts