Component version to 1.2.0
Add package json, gruntfile, and node_modules to gitignore
Fix grunt paths
Grunt vex dialog
grunted
Updating combined
Merge branch 'master' into amd

* master:
  Updating combined
  grunted
  Grunt vex dialog
  Fix grunt paths
  Add package json, gruntfile, and node_modules to gitignore
  Component version to 1.2.0

Conflicts:
	js/vex.dialog.js
	js/vex.js
Compile vex.combined.min.js with grunt @tfinley
Merge remote-tracking branch 'origin/master' into amd

* origin/master:
  Compile vex.combined.min.js with grunt @tfinley
Grunt-build and branch