Merge pull request #1311 from sjinks/1.3.0

Revert d89c1de
Fix HTML5 DOCTYPE
Fix HTML 4.01 Frameset DOCTYPE
Integrate regression tests into PHPUnit
Update .travis.yml
Merge pull request #1313 from sjinks/tests

\Phalcon\Tag — fix tests
Merge remote-tracking branch 'upstream/1.3.0' into valgrind

Conflicts:
	.travis.yml