Added test script and basic JSHint config.
Resolved merge conflicts in index.js