Two space tabs.
Merge pull request #2 from stinoga/master

Two space tabs.
Changes to improve wrap commands' keyboard shortcuts.
Fix merge conflicts