composer.json - Update amp. Fix inconsistent drush metadata (in .lock).
Merge pull request #91 from totten/master-composer-20141012

composer.json - Update amp. Fix inconsistent drush metadata (in .lock).