Merge pull request #1 from StephenFairley/StephenBranch

Much Change. Such Words. Wow
Much Something. Can Love. Children are. Wow.
Merge pull request #2 from cameronbourke/master

Much Something. Can Love. Children are. Wow.
Merge pull request #3 from StephenFairley/master

Pull in Cams change