Add non ifixit url feature
fix conflicts
Merge branch 'master' of github.com:bleventh/iFixitSpamFilter