Cleaning up refs #46
Fixing elasticsearch indexing, refs #23
Improving bundle configuration, refs #31