Wherein Scott learns to write an if statement right.
Merge branch 'develop' of github.com:APTrust/fluctus into develop