adding deft dependencies to gh-pages branch
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages

Conflicts:
	.gitignore
ignore node_modules folder
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
still working on making the layout play nice w/ mobile
still chuggin'
hopefully fixed the rogue dragging issue finally?