Re-enable vi-mode, ubuntu function
Whitespace stuff