Ckeditor: contents should use font of surrounding context.
Remove a few more ckeditor buttons.
browser form controls should inhererit the font of the surrounding context and not have a margin (css-reset)
Edit/New: share more layout, including back button

This allows the back button to be on the same line as the save button.
Styling: style the title input like the title would have been if it were in view-mode.
Style new/edit buttons to be kind of less ugly, even if not exactly beautiful yet.
Use new-style buttons also in the show view.
Use new style button also in the overview list to create a new story.
Use a 1px transparent border in the normal story view to match the colored borders in the edit mode (so toggling modes doesn't cause text jumpiness).
Fix config conflict (should be unnecessary after fix-ckeditor branch was merged).
Merge pull request #26 from eMergence-by-Design/feature/better-timestamp

Better timestamp in story detail
Merge pull request #25 from eMergence-by-Design/better-edit-styling

Better edit form styling
Add staging environment
Add Heroku dpeloy app for Travis
Merge pull request #27 from eMergence-by-Design/feature/add-staging-environment

Feature/add staging environment
Add api_key for development branch

Conflicts:
	.travis.yml
Merge branch 'develop' of github.com:eMergence-by-Design/social-emergence into develop

Conflicts:
	.travis.yml
*lame* Removed trailing quote
Using same account, so same key should be OK
Update heroku api_key