update gitignore
first pass at merging in all the tornado stuff from before