add map to homepage, get asset pipeline to load fonts properly
merge conflict fixes
merge conflicts