Excluded pickles.
Ignoring pickles.
Merging gitignore differences
Beginning swap to scipy constants package.
More removals of in-house constants file.
Removed merge crud.
Fixing merge cruft.
Merge branch 'conserve' of github.com:l3enny/crammer into conserve