Several deploy changes
Merge branch 'master' of github.com:devaddiction/devaddiction