rebuild after a merge issue
rebuild after a merge issue

Merge branch 'master' of https://github.com/RevolutionAnalytics/rhbase

Conflicts:
	build/rhbase_1.2.1.tar.gz
	pkg/DESCRIPTION

aaronbenz/rhbase,aaronbenz/rhbase,aaronbenz/rhbase,aaronbenz/rhbase