update guard gem
scaffold Annotations, spec out request api
add jbuilder gem
gnarly schema merge
fix gemfile.lock mergetool awfulness
annotations api implementation
merge origin/master