Merge pull request #154 from mwhite/ignore

some prep for "ignore but retain" functionality
Merge branch 'develop' of github.com:dimagi/Vellum into develop
remove minified version of some dependencies
remove unused dependency
use grunt to generate a single JS and CSS file

This adds generated files to source control, but I think the benefits
outweigh the downsides.
Merge pull request #60 from mwhite/grunt-uglify

Use grunt to generate a single JS and CSS file each
remove unused/old jquerys
add same jquery version as HQ as a test lib
Merge pull request #61 from mwhite/jquery

jquery version
add equivalent-xml-js
update gitignore
add "Ignore But Retain" plugin