Migration to Media Temple
Merge branch 'master' of github.com:simoncorry/live