Added travis.yml for unittests
Added before_script to fix travis tests
Added travis build status icon
Merge branch 'master' into refactor

Conflicts:
	.travis.yml