added ability to specify token format
Merge branch 'rails-2.3.x' of github.com:berk/tr8n into rails-2.3.x