update location
fix 404 links
Add example to Twitter Etiquette

initially put this on the wrong branch, that's gunna cause pain later :(
fix conflicts