Merge pull request #1 from beawimp/master

Update randy's fork of the WMD
Fixed template location for custom post type

Key learning: is_post_type_archive() only works under very limited
circumstances. Changed template_redirect action to template_include
filter.
Better version of template locator hook

Includes the actual filter return, so the rest of the site doesn't
break, yay!
Reversed the conditional for is_single()

Instead of testing for false, we're now testing for true and it makes
better sense.
Get that template_include filter under control

Now with the correct logic to filter member-directory single and
archive templates, including locating the templates inside of themes,
and following DRY.
Merge pull request #3 from randybuildsthings/master

Fix to custom post type template locator. Attempt #2
Changes to taxonomy class

Updated to have the taxonomy names as class constants for reuse in
templates.
Merge pull request #2 from randybuildsthings/taxonomy-fix

Changes to taxonomy class
More taxonomy wrangling

Renamed the one-price taxonomy to be a "low price" taxonomy, and then
created an additional "high price" taxonomy. Updated the initialization
code to register both properly.
Merge pull request #3 from randybuildsthings/taxonomy-fix

More taxonomy wrangling
Merge pull request #5 from randybuildsthings/master

Changes to taxonomy class
Cosmetic: leveling out constant assignments

Lining up the RH values to make Cole happy :)
Merge branch 'feature/archive-template' into stage

* feature/archive-template:
  Completing the styles/layout for the large member listing
  Adding styles and misc tweaks to PHP and Sass for the listing meta
  Updating the listing meta to utilize a table based layout with filters to adjust the HTML if needed.
  Removing the Flexslider paginate controls and removing padding below the bottom
  Adding the "columnize" sass mixin
  Adding some more documentation to the divide-by-base Sass function
  Fine tuning the header section of the large listing
  Updating/Fixing Flexslider slide buttons to reflect our design mocks
  Adding archive sass styles
  Updating the Sass with some common partials and base styles
  Fixing the output of the prices to utilize proper number formatting
  Making the logo configurable between image and text versions.
  Backend components and HTML built for the archive template
  Adding slider for the portfolio pieces
  Committing updates from yesterday. Progress!
  Adding author support to the member directory CPT as the first step for #8
  The start of the archive template page
  Fixing permalink not working on activation

Conflicts:
	includes/class-wmd-member-directory.php
Merge branch 'stage' into feature/archive-template

* stage:
  Cosmetic: leveling out constant assignments
  More taxonomy wrangling
  Changes to taxonomy class
  Get that template_include filter under control
  Reversed the conditional for is_single()
  Better version of template locator hook
  Fixed template location for custom post type