add dbslave, change enc to dropbox
enable ted user on armtdev
git rebase master
Merge remote-tracking branch 'origin/master'
git diff master
vagrant global-status
vagrant global-status --prune
Merge remote-tracking branch 'origin/master'
git rebase --interactive master
vim ~/dotfiles/aliases.fish
docker rm exited
Merge remote-tracking branch 'origin/master'
add docker export
remove prompting for diff and merge
Merge branch 'master' of github.com:binaryphile/dotfiles
fix docker ps abbrevs
fix docker ps abbrevs
docker build
docker save
docker load