change props on server around, other minor changes
Merge branch 'brad-changes'
new conf folder, forgot to check it in earlier
more sane config defaults & comments
version bump
Merge pull request #5 from boorad/master

my recent work
Fixed conflicts