Overriding .to_solr to use our own mapper
removed rvmrc
Ignoring .rvmrc files
Syncing branchs
Committing empty tmp directory so tests will pass straight away
Updating the README
Merge branch 'master' into v1.1
Merging in pull requests from upstream