Ignore the .conf file unless we need to change it
Test and prod application configs created
Merge branch 'master' into dev

Conflicts:
	.gitignore
Merge pull request #9 from Venture-TheSphinxTeam/dev

Dev