adding conf data and .gitignore
adding recent changes