Updated spellings
Merge branch 'master' into development
Merge branch 'development' of https://github.com/shahmirj/sjsystem into development
Vimrc now uses the better resizing commands to resize windows
Merge branch 'development'