Fixed distribution of files in /conf
Merge pull request #39 from adamschmidt/master

Fixed distribution of files in /conf