Last pass at code. still needs testing. Added grunt-modernizr