Merge pull request #1 from vuhl/master

merging down
adding redirect mocking
Merge pull request #3 from lepermessiah57/master

Adding ability to mock redirection