Added .DS_Store to .gitignore file and added isset var check for install page
Updated all shortcodes to <?php echo for compatibility
Updated version internally
Merge branch '31-shortcodes'
Merged in the latest master.