better silverstripe handling
Merge branch 'master' of github.com:dnadesign/shipistrano

# By John Milmine (4) and Jeremy Shipman (1)
# Via John Milmine (1) and Will Rossiter (1)
* 'master' of github.com:dnadesign/shipistrano:
  working on deploy user
  getting preview working for deploy user
  Fix rewrite base to include a line break before adding the “RewriteBase /“ config
  whoops, wrong elseif
  added htaccess for non ss sites
changed to ruby if