bump version
Merge branch 'master' of github.com:oinume/tomahawk