Fixed some raise-or-run weirdness, cleaned up whitespace, added a few git aliases.