Fix indentation mix + ignore VIM's temp. files ("*~")

Some minor stuff I encountered while doing the recent merge for PR #250.