Removed redundant readme (see WordPress) and resolved merge issues with shortcode.php