Revert "Try adding Volumes and Logging to Dockerrun.aws.json."

This reverts commit 578d4b4f20f385fcb5c7a10a295fd3a77dc945aa.
Revert "Increase timeout for Elastic Beanstalk."

This reverts commit 73695e6a8cccd918dd7832360f7868e942820be0.
Revert "Add Dockerrun.aws.json to play with deploying to Elastic Beanstalk"

This reverts commit 4f3e6a5e56ee08d79daf61a494f78d2fb1957a1c.
Prevent blockquotes from having a larger font-size than everything else. closes #11
Add tags to journal entries.
Dockerfile: From progrium/cedarish instead of phusion/baseimage.
Merge branch 'master' into stable

Conflicts:
	Dockerfile