APS & JTR: fucked ourselves
Merge branch 'master' into snippets/refactor
APS & JTR: create source-snippet association, refactored source feature tests
Merge pull request #57 from gopher-snakes-2013/snippets/refactor

APS & JTR: Snippets/refactor