Merge branch 'joindin-267' of github.com:Tocacar/joindin-web2
Merge branch 'master' of github.com:joindin/joindin-web2
Small HTML tweaks to clean up some old-site HTML (removing divs that aren't needed anymore, following new coding standards, etc)
Merge remote-tracking branch 'clairs/sponsor-cleanup'