aswartz additions
added jonclayton and jimmyprescott.txt
Updated metadata
Merge pull request #32 from mattjbarlow/jimmy_dev

Jimmy dev
bump version
merge
Merge branch 'anthony_dev' into staging
Helmut was here ...
finaly  noticed that I need to commit befor pushing ( the button )
Merge
Merge branch 'chrism_dev' into staging
updated metadata
attempt to fix version to match staging
undo previous change
Merge pull request #36 from mattjbarlow/staging

Staging to prod
merging
completing merge for helmut
Update default.rb

I broke the merge :( fixing now by removing git lines and correcting.
added ajgeiger.txt and changed version to 1.20
added ajgeiger.txt and changed version to 1.20