Merge pull request #1 from ericpaulbishop/master

update
Merge branch 'master' of https://github.com/ericpaulbishop/gargoyle into ericpaulbishop-master
Merge branch 'master' of https://github.com/ericpaulbishop/gargoyle
Merge branch 'master' of https://github.com/ericpaulbishop/gargoyle
Merge branch 'master' of https://github.com/ericpaulbishop/gargoyle
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'