keys.js
pulled justins changes, merge conflicts