Updated FAQ links to the new wiki
Merge pull request #253 from lmbarros/patch-1

Updated FAQ links to the new wiki
Remove all $(V1 ...) macro calls
Remove $(V2 ...) macro (leaving its contents)
Merge pull request #255 from leandro-lucarella-sociomantic/remove-v1-v2-macros

Remove $(V1/2 ...) macros
proverbial last bug
Merge branch 'master', remote-tracking branch 'upstream/master'