Shortcodes
- code cleanup
- simplify context storage
- fixes for correctly displaying saved shortcodes
- fixes for slideshow shortcode attributes not working