Cleaned up code, added 'spec' directory
Remove stray file
Merge pull request #2 from neilrenicker/master

Clean code and add spec file