Try #3
Try #3

Merge branch 'travistests' of https://github.com/randyzwitch/RSiteCatalyst into travistests

Conflicts:
	.travis.yml