IDI-104: Fix whitespaces in PHP file.
IDI-104: Remove use of fluid.merge() for adding items to the static environment.
IDI-104: Remove use of fluid.merge for adding items to static environment
Merge branch 'IDI-104' of github.com:acheetham/infusion-videoPlayer-wp-plugin into IDI-104

Conflicts:
	infusion_videoPlayer.php
IDI-104: Update the plugin readme
IDI-104: Refactoring to improve code.
IDI-104: Refactored rendering of track rows
IDI-104: Add and style some instructions
IDI-104: More code clean-up
IDI-104: Move the UIOAnnouncer ready event to fire after we're more sure that UIO is ready enough
IDI-104: Progress restructuring forms; not complete yet.
IDI-104: Fix rendering of labels, empty file lists; convert video format choice to drop-down
IDI-104: All functioning. Needs clean-up
IDI-104: Add initial prompts to drop-downs
IDI-104: General clean-up
IDI-104: Cleaning up the admin interface
IDI-104: Add some documentation to the README file and indicate default button strings in Admin panel.
IDI-104: Minor simplification of resource fetching.
IDI-104: Refactor the produceTree() functions to simplify; other clean-up.
VP-304: Add jQuery.noConflict to avoid problems with differing versions of jQuery. Restructure script queuing accordingly.

Also fixed the shortcode processing to take into account changes in WordPress handling.