Add pre python 3.3 support to nzb template
Remove conflict lines from gitignore
Add pre python 3.3 support to api result template
Add favicon endpoint to api.py
Merge pull request #39 from bettse/bettse/gitignore_conflict

Remove conflict lines from gitignore
Merge pull request #41 from bettse/bettse/favicon

Add favicon endpoint to api.py
Merge pull request #40 from bettse/bettse/pre_py_33

pre python 3.3
Add xmpp bot to distribute nzbs
Merge remote-tracking branch 'upstream/master'