Add Inline PHPDoc entry and @type changes

The concept of an Inline PHPDoc has recently become available and
is considered to be a good idea. I have added it to the specification
for future discussions and to integrate it.

@type is now required to have a name component (as with @param)
to support compound statements.
Make use of @type consistent

Some parts of the document still referred to @type as being free
from a name. This is now fixed
Add missing closing brace

A closing brace was missing from the 'Inline PHPDoc' example.
English proofreads; some uppercasing of RFC2119 keywords;
example should use @type rather than deprecated @var
missing close brace in inline phpdoc example
add visible TODO markers regarding @global, @ignore, @internal, and @link
remove TODO about @ignore... it is listed at end of doc as app-specific rather than standardized
TODOs to write up @param, @property, @see, @throws, @todo, @uses;  TODO to revisit 'only one' @var limitation
English proofreads over last half of doc
write description for @since
write description for @version
Merge pull request #641 from ashnazg/psr

PSR updates
Added descriptions and answered TODOs
Fix review items in PR
Added section on @uses
Add @struct, expand Inline PHPDoc, add hashes and add relations

In this commit we add additional information for inline PHPDoc's,
add the description how to interpret a hash (including a reference to
@struct) and expand the @see docs to include relation type.
Merge pull request #645 from mvriel/psr

Added descriptions and answered TODOs
Added Sphinx to the Vagrant Toolchain
Merge branch 'develop' of github.com:phpDocumentor/phpDocumentor2 into psr

Conflicts:
	docs/PSR.md