Remove /usr/local/bin/meteor bit
Merge branch 'master' into admit