Update to support rails 3.0+
Update formtastic
Merge branch 'master' of github.com:PragTob/surveyor into PragTob-master