Cleaned up Gruntfile, also made some changes to fix e2e tests
(apparently)