affix positioning and this.unpin update
Merge branch 'v3.0.0-affix-fix' of https://github.com/buberdds/bootstrap into v3.0.0-affix-fix

Conflicts:
	js/bootstrap-affix.js