author page updates
Merge branch 'master' of https://github.com/CondeNast/pangea

Conflicts:
	themes/wired/assets/css/wired-beats.css
	themes/wired/assets/css/wired-feeds.css
	themes/wired/assets/css/wired-global.css
	themes/wired/assets/css/wired-home.css
	themes/wired/assets/css/wired-post.css
	themes/wired/assets/css/wired-subwired.css
dealing with css merge conflicts