Merge branch 'hotfix/0.2.5'
Add travis to master as well
Merge branch 'release/0.3.0'

Conflicts:
	.travis.yml
Update README.md
Bumped version
Return passed in where string

If the user wants to use a custom WHERE string, old deprecated _setWhere
needs to return said WHERE string, instead of trying to parse it.
Update changelog
Merge branch 'hotfix/0.3.1' into develop

Conflicts:
	composer.json