adding .idea to .gitignore for jetbrains users
moving db and port settings into env vars since heroku only works off of git commits
Procfile for starting the app (migrations need to be run separately)
Add imports so that classes in other files are found
Also change the name of the npm-package 'up' to up-time in puppet script

See also https://github.com/mozilla/openbadges/issues/925
Merge pull request #940 from colinfrei/fix-setup

Fix Setup issues
removing hostname from config, re: [change to persona audience setup](https://groups.google.com/forum/#dev/XGJeGGtRtgo)
Revert "removing hostname from config, re: [change to persona audience setup](https://groups.google.com/forum/#dev/XGJeGGtRtgo)"

This reverts commit 92edd8b32505c4c3c993202cdecbeecfae646ff6.
keeping hostname in config, but changing the explanation
Potential workaround for #932: force modal-less UI on IE.

This isn't a great workaround, as it boots the user off the issuer's site
and redirects them to the backpack without an easy way to return to where
they came from, but it's much better than what currently happens. And it
avoids the legal issues involved in delivering a P3P header that makes
the modal issuer flow "just work".
upgrading version of badge-bakery
Merge pull request #941 from cmcavoy/development

Update README / config to remove hostname as setting.
v1.0.34
Fix zombie'd node issue.
Merge pull request #922 from jpcamara/development

Make openbadges Heroku-able
1.0.35
Fixing 'invalid' email address regex
Merge pull request #951 from andrewhayward/development

Fixing 'invalid' email address regex
Merge pull request #952 from stenington/docs

Issuer API docs move
Update api.md
Document Issuer API issue_no_modal
Merge remote-tracking branch 'toolness/issue-932-workaround' into docs

* toolness/issue-932-workaround:
  Potential workaround for #932: force modal-less UI on IE.