bug fixes
switched back to main salt tree for vagrant, add uwsgi timeout extension setting