finally switch to spaces
Merge branch 'master' of github.com:blampe/dotfiles
s3 stuff