Merge branch 'master' into fork_master

Conflicts:
	.travis.yml

diff --cc .travis.yml
index c6c758fd555e29dca0941ae877dcb86a8a582af0,0c62e4729681c7a7a865bcedad24f8b6b2d76e5a..0aabce6a73cf96dc70bff38901a6e4f98521bf17
--- 1/.travis.yml
--- 2/.travis.yml
+++ b/.travis.yml
@@@ -2,12 -2,10 +2,12 @@@ language: pytho
  python:
    - "2.6"
    - "2.7"
 -notifications:
 -  irc: "irc.freenode.org#youtube-dl"
 -#command to install the setup
 -install:
 -# command to run tests
 +#  - "3.3"
- script: nosetests test --nocapture
+ script: nosetests test --verbose
 +notifications:
 +  email:
 +    - filippo.valsorda@gmail.com
 +  irc:
 +    channels:
 +      - "irc.freenode.org#youtube-dl"
 +    skip_join: true

diff --cc youtube_dl/__init__.py
Simple merge