added eliot
Merge pull request #2 from newdynamx/bug-42

Bug 42
Added Chris
de-conflicted
Merge pull request #3 from newdynamx/bug-84

Added Chris
Merge pull request #4 from newdynamx/staging

Staging
Merge pull request #5 from newdynamx/production

Merge pull request #4 from newdynamx/staging
Merge branch 'staging'