Merge pull request #4 from spartan-array/master

Update to newest code
Merge branch 'master' of github.com:spartan-array/spartan
fix test_serialization nosestest error
fix test_serialization nosetest error
Merge pull request #70 from MaggieQi/master

fix test_serialization nosetests error