Revert changes to makefile/etc.
Merging in victor's code; adding a mystore.dat for submission.