Remove legacy shortcode code
Update version for dev branch
Custom post types only added to main query
* Resolve #1
Custom post types added back to CNR-initiated queries

* Add: Custom query var to CNR queries
* Add: Check for custom query var before adding custom post types to query
* Optimize #1
Update version (0.7b4) and release notes