Modified pentdactalyl, vim and awesome -> dvorak
Merge branch 'dvorak'