bumps version
fixes travis, adds ruby 2.1
downgrades to thread_safe 0.2.0 as 0.3.0 has been yanked
merge in branch from langalex