resolve merge conflict
Remove uglify from watch task.
Fix old property names and define index page object.
Fix path to jquery.
Merge pull request #35 from optimizely/dfoxpowell/gruntfile-again

resolve merge conflict