Doc block cleanup
Merge branch 'develop' into documentation-cleanup

Conflicts:
	amazon-web-services.php
Merge pull request #53 from deliciousbrains/documentation-cleanup

Doc block cleanup