starting to untangle data functions
New stuff is happening. Hi, people who read my commits!
Merge branch 'master' into gh-pages

Conflicts:
	build/build.sh
	index.html
	js/app/main.js
	js/sanity.js
	js/sanity.min.js
merging.