change functionality of 'Keep Draft' button from cancel to save
Merge pull request #1214 from tuff-ghost/issue_3599

3599:  Chapter drafts can no longer be edited and re-saved as drafts
issue 3602: Upgrade to Capybara 2.0.3
rebase
standard template
Removing old file
Conflicts ahoy
Merge pull request #5 from scottsds/upgrade_capy

Upgrade capy