favor alignments closer to the diagonal
Merge branch 'master' of https://github.com/drayson92/sp2014.11-731