kill unused captcha code
Merge branch 'master' into cleanup

Conflicts:
	functions.php
Merge pull request #19 from stwalkerster/cleanup

Kill the unused CAPTCHA code