Make r10k optional. Extends PR #4