updates baseurl and gitignore
fixes conflict
puts site baseurl back