edited gitignre, cleaned up #includes a little bit