Updated some plugins... use rails plugin instead of rails3
Merge commit 'e726f03fc967b44abf53d79bdd1823e248902546'