Revert "Merge pull request #171 from dimagi/revert-vellum"

This reverts commit cc912ed04a4b089f728efcb9354e02c2006c9d0b, reversing
changes made to 488728c1cca8006f16759119e0bde8a9d30726ad.
Revert "fix issue with mug.parentMug"

This reverts commit ffecf2158023ce8610128476e3dab6939ce72cc6.

Conflicts:
	dist/vellum.min.js
refactoring to undo the previous revert of a fix

This refactors some stuff in the question adding methods.  One effect is
that questions are no longer added based on the currently-selected mug,
instead it's explicitly passed.  This should make loading a form faster.
Merge pull request #82 from mwhite/fix

fix issue in previous release
Merge branch 'develop' of github.com:dimagi/Vellum into develop
fix issue on empty forms
Merge branch 'develop'
Merge pull request #172 from mwhite/master

fix issue in previous release
temporarily revert to state at e265056 for testing
Merge pull request #173 from mwhite/temp-fix

temporarily revert to state at e265056 for testing
Merge branch 'master' into develop

Conflicts:
	src/js/model.js
Merge branch 'master' into develop

Conflicts:
	src/js/formdesigner.javarosa.js
	src/js/widgets.js
fix path in Gruntfile
fix double escaping

It turns out the hosted version of the XML-Writer util we had vendorized
added one thing: HTML escaping.
Merge pull request #188 from mwhite/temp-fix

fix double escaping
update gitignore
fixes #89: don't show question type for choices
fix #87: can't delete extra itext content
Merge pull request #192 from mwhite/temp-fix

fix issues
help icons work on firefox