tweak htaccess so subdomain usernames will work with root
Merge remote-tracking branch 'upstream/master'
Merge pull request #487 from jessevondoom/master

redirecting beginpayment stuff #ciskip