Combine vim modelines and Python encoding declarations

Ref #314
Merge branch 'develop' of git://github.com/Lokaltog/powerline into develop