Use dict.get() with default value instead of handling KeyError
Merge branch 'master' of github.com:todayman/word_alignment

Put my changes back in, both formatting and others (argparse, etc.)