a few deployment and development tweaks
Merge pull request #1 from stephancom/master

a few deployment and development tweaks