Merge pull request #2 from robfig/master

Merge into master robfig/revel