changing to rails 3
Merge branch 'development' of https://github.com/joshsoftware/kimayaTPN into development