Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Added version and enablejsapi to YouTube embed URL
Merge branch 'dev' of github.com:rblstr/flock into bugfix-youtube-api

Conflicts:
	flock.py
	tests.py
Merge pull request #36 from rblstr/bugfix-youtube-api

Added version and enablejsapi to YouTube embed URL