update 301s & core backbone code
update 301 errors
add htaccess to fix merge conflicts