Merge pull request #17 from rwwarren/dev

Dev
Merge pull request #18 from rwwarren/dev

Dev
Merge pull request #19 from rwwarren/dev

Dev
fix url things
update forwarding
Merge branch 'master' into dev