removed allowed tags from excerpter... no html is allowed to ensure markup is not broken; changed links shortcode to accommodate new post type
added "links" post type with link_type taxonomy and [links] shortcode
Merge branch 'feature-links' into develop
limits increased to 10
removed thumbnail styles that broke layout
manual merge from upstream