Improved shortcode handling and inferno templates
improved template handling
kp
Merge branch 'master' of https://github.com/dotwired/Inferno
conflicts resolved