Merge pull request #105 from spenceralger/2.1

update 2.1 with changes from master
version 2.1.5
forgot to exclude _elasticsearch directories from npm
version 2.1.6