Exploratory updates

Submitting this pull request for visibility and intermediate feedback.

Please do not merge until:
- [ ] fully integrated with [bob](https://github.com/modcloth/bob)
- [ ] server meets all requirements for new use cases