allow index-name for elasticsearch to be something other than titan, if
desired
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/main/webapp/js/app.js
Merge pull request #14 from cglewis/master

allow index-name for elasticsearch to be something other than titan, if desired