Adding rsync command for use with vagrant 1.5

Also lots of pep8 cleanup.