ignoring .DS_Store files
Setting WP_Query::$query_object_id and registering page-slurp post type
Merge branch 'refs/heads/master' into rebrand

Conflicts:
	CC/PageSlurp.php