[add] unit test for phpDocumentor\Plugin\Core\ServiceProvider::register()
Updated CHANGELOG to reflect template change
Composer updates
Removed a duplicate .gitignore entry
Travis improvements
Make sure the tests run on phpunit 4.x
test for configureLogger
Ensure /tmp/ is the start of a path before replace

We have an issue where '/tmp/' is in the target path, but is not the lowest directory (/usr/local/zend/tmp/). This folder is already the system temp folder... which is causing the path to become '/usr/local/zend/usr/local/zend/tmp/'
Update ParseCommand.php

Fix formatting
Add flow documentation and expand glossary
Improve reading flow; Changes I to We to feel warmer [ci skip]
Fix for Fatal error: Call to a member function getParent() on a non-object in ConstantDescriptor.php

This method needs to be able to return false if $node is not an instance of Descriptor\ConstantDescriptor.
Fix for: Fatal error: Call to a member function getParent() on a non-object in PropertyDescriptor.php

This method needs to be able to return false if $node is not an instance of Descriptor\PropertyDescriptor.

See also: https://github.com/phpDocumentor/phpDocumentor2/pull/1429
Merge pull request #1430 from gammamatrix/patch-3

Fix for: Fatal error: Call to a member function getParent() on a non-obj...
Merge pull request #1429 from gammamatrix/patch-2

Fix for Fatal error: Call to a member function getParent() on a non-obje...
Merge pull request #1425 from randomecho/copyedit-create-own-template

Improve reading flow; Changes I to We to feel warmer
Merge pull request #1418 from segrax/patch-1

Ensure /tmp/ is the start of a path before replace
Merge pull request #1416 from jaapio/test/Application

test for configureLogger
Merge branch 'develop' of github.com:phpDocumentor/phpDocumentor2 into develop
Merge branch 'stuff' of github.com:GrahamCampbell/phpDocumentor2 into GrahamCampbell-stuff

Conflicts:
	composer.lock