Merge pull request #15 from adhintz/master

server fixes

Merge pull request #14 from adhintz/master

project rename & commits from the last week or two