remove pantheon stuff
backup .htaccess
update conflicts
messy