Merge pull request #1 from mjcdiggity/develop

RSpec setup.
Merge pull request #3 from mjcdiggity/develop

Gemfile.lock