Updating vapor website
Closes #153
Merge branch 'master' of github.com:josefnpat/vapor