Add Vim swap files to ignore
Merge pull request #947 from ain/gitignore

Add Vim swap files to ignore
Fixed a typo
Merge pull request #951 from caseyhelbling/spelling-error

Fixed a typo
Without this, the sentence doesn't quite make proper sense.
Merge pull request #960 from seanhandley/master

Without this, the sentence doesn't make proper sense.
No need to define a method that only calls "super"

It used to also define "@name = 'cap'" originally: https://github.com/capistrano/capistrano/commit/de6367af4ea3ea786fe78221cfd3838c827c5e0c
Merge pull request #965 from rosenfeld/patch-1

No need to define a method that only calls "super"
Added keys method to Server properties

When generating servers programmatically this provides a method
of determining what properties have been added.
Includes simple spec test
Merge pull request #969 from townsen/master

Added keys method to Server properties
Combined emphasis use underscores
Merge pull request #975 from nemesis/patch-1

Combined emphasis use underscores
Fix some typos
Fix typo hg vs. svn
Merge pull request #977 from carlosbuenosvinos/patch-1

Fix typo hg vs. svn
Merge pull request #976 from jwworth/task/fix_typos

Fix some typos
Correct typo in changelog.
Merge pull request #978 from jjoos/master

Correct typo in changelog.
Remove unused and empty method definition
Merge pull request #992 from svanderbleek/remove-method

Remove unused and empty method definition