Deleted extraneous files.
Merge branch 'master' of github.com:silentorb/vineyard