Merge pull request #12 from jaredbischof/master

Updating to latest Shock code.
Merge pull request #13 from jaredbischof/master

Added Shock Node attribute_indexes to config file and Makefile.
Update to Shock version.