Changed to deploy from upstream
Merge branch 'master' of https://github.com/vsmegaming/VsMe

Conflicts:
	config/deploy.rb
small change to test deploy framework.  Will undo in a minute.
Undo test changes.
Change in deploy to restart after deploy.
Added sencond repo as comment for easier switching.
Merge pull request #10 from matthewbentley/master

Should auto-restart server now