Merge pull request #223 from ryedin/master

fixed the case for redirect loops and other bad stuff
render options overwrite bugfix
Merge pull request #224 from chris-held/master

fix for selector overwrite in render