added read xlsx for linux platforms
df.r formatting
test for factors before mergeBetter
random merge

Merge branch 'master' of github.com:jackwasey/jwutil

Conflicts:
	R/df.r