editorial
Merge branch 'master' of github.com:121watts/the_pivot
pended, failing api spec
fiddled with navbar class in application css to hopefully fix navbar
set padding: 6px 15px in .navbar-brand class
deleted api stuff, not sure why it was there
deleted all api stuff
still trying to delete api stuff
finally clean specs
Merge pull request #197 from 121watts/fixnav

Fixnav :shipit: