Renamed index and addeded more to .gitignore
A bunch of changes during the last hackMatch.
Merge pull request #6 from rgebhardt/scala

Updates from last hack match.