merging develop into crichton demo

merging latest changes into crichton demo

all specs continue to pass...
```
Finished in 1 minute 19.46 seconds
1074 examples, 0 failures

Randomized with seed 36664

Coverage report generated for RSpec to /Users/jlo/Documents/crichton/coverage. 5542 / 5693 LOC (97.35%) covered.
```

@fosdev , @mdsol/hypermedia-team
please review... thanks!