Whitespace & typos
Merge branch 'dev' of https://github.com/hashbangcode/vlad into dev