A merge and update so we can update the npm package

Let me know if/when you publish to npm as I've published a fork for now. backgrid-cabbiepete.