updates from cloud server
Merge branch 'develop' of github.com:ryanolson/dotfiles into develop