ENH: Added new overlap penalty term and test

Change-Id: Ie3501809c8c543caa8f2eebe573e44639a17867e
Merge topic 'OverlapTerm'

71adc50 ENH: Added new overlap penalty term and test