Small .gitignore correction/generalization.
added -e flag for error tolerance specification for magic.py and corresponding tests
fixed small bug in magic.py test