more bugfix
Merge branch 'master' of github.com:JerrySievert/Terraformer
Merge branch 'master' of github.com:Esri/Terraformer
tidy
Merge branch 'master' of github.com:Esri/Terraformer
Merge branch 'master' of github.com:Esri/Terraformer
mergefix
Merge branch 'master' of github.com:Esri/Terraformer
Merge pull request #212 from JerrySievert/master

more docs
Merge branch 'master' of github.com:Esri/Terraformer
favicons
removefavicon
Merge pull request #215 from nikolaswise/master

favicons
favicon and tweak some css
Merge branch 'master' of github.com:Esri/Terraformer
wrap up doc changes
add cname
more tweaks for website
update arcgis version
add sr option nots