Merge pull request #7 from Theiforums/develop

Develop
Merge pull request #9 from Theiforums/develop

Develop
Merge pull request #11 from Theiforums/develop

Miscellaneous Changes
Merge pull request #12 from chukShirley/develop

Add vendor name and version number to composer.json
Revert "Add vendor name and version number to composer.json"
Merge remote-tracking branch 'upstream/revert-12-develop' into develop

Conflicts:
	composer.json