Merge pull request #2 from jerturowetz/master

Get all the good stuff!
update README.md with BKDSN comment
Merge remote-tracking branch 'origin/master'
Update CONFIGURE-wp-config.php
Merge pull request #4 from JackBranding/master

Merge pull request #2 from jerturowetz/master
Merge pull request #3 from BKDSN/master

BK additions
Merge pull request #3 from jerturowetz/master

Grab wp-config glitch fixes
Merge remote-tracking branch 'boilerplate/master'