Merged PR #1337 Squashing commit history to get rid of vi call-outs.

This commit was created in emacs, the best text editor ever!