Merge pull request #8 from jpkeane/master

Rebase staging
Merge pull request #9 from jpkeane/calliope

Merge pull request #7 from jpkeane/master
Merge pull request #10 from jpkeane/staging

Merge pull request #8 from jpkeane/master
Merge pull request #12 from jpkeane/calliope

Calliope
Merge pull request #13 from jpkeane/calliope

Calliope
Merge pull request #14 from jpkeane/staging

Merge pull request #13 from jpkeane/calliope
Merge pull request #15 from jpkeane/master

Rebase Calliope