Updated CHANGELOG to reflect template change
Composer updates
Removed a duplicate .gitignore entry
Travis improvements
Make sure the tests run on phpunit 4.x
Add flow documentation and expand glossary
Merge branch 'develop' of github.com:phpDocumentor/phpDocumentor2 into develop
Merge branch 'stuff' of github.com:GrahamCampbell/phpDocumentor2 into GrahamCampbell-stuff

Conflicts:
	composer.lock
Fixing a test and merge conflict in composer.lock