Feature/ruby2.1

@sbfaulkner 

Updates for ruby 1.9.3 and ruby 2.1 compatibility.
Cleans up unused and broken code.