Resolved conflicts with master. Added () for string formatting long paths in setup.py.