Updated conditional styles module in make file
Added configuration options to taxonomy menu to set vocabulary
Merge remote-tracking branch 'origin' into release