re-ordered gemfile to something more logical, added engineyard config yml, and changed webserver to puma