last commit before merging back. Pulling out ruby-dev specific stuff.