Fix english usage error, as requested by nikki.
alias-ended: split into two scripts
Merge branch 'schema-changes-2013-10-15'
Merge branch 'master' into beta