split less files, eliminated glyphicons
fixed citation graph issue for very large graphs, added back query builder css
added reads graph, improved facet interaction
addressed Romans comments

made links relative to base, otherwise they dont work-- shouldnt matter once discovery.html is named index
changed name of discovery to index

fixed catchall routing function to match backbone routes, fixed abstract issue
Merge branch 'aholachek-misc-fixes'
fixed 2 tests
Merge branch 'aholachek-misc-fixes'
Added libraries required for Phantomjs
Merge pull request #84 from jonnybazookatone/hotfix-puppet

Added libraries required for Phantomjs
Fixed the travis not-reporting test failures
Merge branch 'master' into vss-deploy

Conflicts:
	manifests/site.pp
	src/discovery.html
	src/js/apps/discovery/main.js