Load custom phpunit version
update travis.yml to update composer
Merge branch 'ComposerIntegration' of https://github.com/joomla-projects/joomla-cms into ComposerIntegration
Updates as discussed
Update rather than install
Merge pull request #259 from wilsonge/ComposerIntegration

Select a PHPUnit version (4.1) so unit tests do not fail