updated travis and phpunit configs
Merge branch 'master' into develop

Conflicts:
	test/phpunit.xml.dist
Merge pull request #4 from packfire/develop

Development updates for 1.0.1