Cmall adjustments to the style of trim_align.py
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Finished refactoring trim_align.py and added one test.
Merge pull request #3 from schryer/master

Small refactor.