reverted rails project back to netspeak
Merge branch 'master' into gh-pages