Spudz76 master

pulling in changes from @spudz76 and PR https://github.com/evantahler/actionHero/pull/277/

- solving merge conflicts