shazbot?
Merge branch 'master' of github.com:jaquadro/Amphibian
Merge branch 'master' of github.com:jaquadro/Amphibian