merge conflicts + changes
merge conflicts
update seeds
rename js file
I DID IT
added import after indexed json
bonsai config
updated gemfile
removed unnecessary init
Merge pull request #101 from calblueprint/jdu/elasticsearch

Jdu/elasticsearch