Kim's tweaks.
tgm
Merge branch 'master' of github.com:strangerstudios/pmpro-bbpress

Conflicts:
	class-tgm-plugin-activation.php
	pmpro-bbpress.php