closes socd-io/Deployment#135
Merge branch 'master' of github.com:socd-io/Theme