Applying all the changes which were required for this brach.. but then h...

Removed rails dependency.