Fixing tests
Fix .gitignore and typos
Merge pull request #2 from benjello/master

fix typo and transitional bugs