Update to Bootstrap 3.3.1 and minor changes on Gruntfile