[conflict] Reset gemlock file
Merge branch 'development' of github.com:jordan-lewis/middleman-boilerplate into development
[readme] Updated readme
[readme] Spelling corrections