Added custom conf in gitignore
Merge branch 'bootstrap' of https://github.com/mtdowling/Sami into bootstrap