Merge pull request #1525 from kmarsteller/dev

bye bye gists