Updating infrastructure
Merge branch 'master' of https://github.com/rapidftr/RapidFTR
Merge pull request #779 from andreweskeclarke/master

Updating infrastructure