added popwin config (popwin.el)
Merge remote-tracking branch 'origin/master'

Conflicts:
	configurations/popwin.el