Whitespace merge
Update hook usage for init & _setup functions.

Run init() on after_setup_theme, and in WiredAbstract::init, hook
_setup to pre_get_posts.
Override Abstract's init() with new init in WiredAdmin, because
WiredAdmin's _setup shouldn't be run on pre_get_posts.
Merge branch 'master' of https://github.com/ryelle/pangea into ryelle-master

Conflicts:
	themes/wired/classes/class-wired-abstract.php
	themes/wired/classes/class-wired-admin.php
	themes/wired/classes/class-wired-homepage.php
	themes/wired/classes/class-wired-subwired.php
	themes/wired/functions.php
merge