Removed default shortcode includes, fixed usage of globals in shortcodes, updated data-tools so it uses a data-library global