Correct filenames.
Adds .gitignore
final pre-Faire updates
Merge pull request #9 from benlk/master

Pre-Faire cleanup