Revert "Add CNAME option"
Merge pull request #696 from progrium/revert-657-CNAME_option

Revert "Add CNAME option"
Fixed key format check
Display help when invoking dokku with no parameter
Merge pull request #701 from jazzzz/fix-key-format

Fixed key format check
Merge pull request #703 from jazzzz/help-with-no-parameter

Display help when invoking dokku with no parameter
Consolidate readme/wiki docs into organized docs folder
Merge pull request #706 from progrium/docs

Consolidate documentation for viewthedocs
various grammar fixes, spell fixes and added missing words
Merge pull request #709 from rinti/documentation-fixes

various grammar fixes, spell fixes and added missing words
Merge remote-tracking branch 'upstream/master' into mh-merge-upstream
Merge pull request #1 from expa/mh-merge-upstream

merge from upstream