Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
Merge pull request #124 from dheckman/master

friendly id, api call limit adjustments
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
note count with responsive proper pluralization of the word note now in place on rambles on user profile page, button on ramble page, button on discover page.
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
made the URL field a link on note on ramble in user profile
Merge pull request #125 from dheckman/master

friendly id to users
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
Merge pull request #126 from gregburton/master

additional note things, including providing note count at pertinent places on site
merging
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
added .trim to remove whitespace around body and url
Merge pull request #127 from Noahhh/master

Added .trim in JS to remove whitespace around body and url
removed white space at bottom of home page
added some code to users controller in attempt to resolve issue with profile page erroring out when add button is clicked without first specifying file to use as avatar. Unfotunately didnt' work, but I'm leaving it in the users controller for now, commented out.
added slug.blank? || to the should_generate_new_friendly_id portion of the user model in attempt to fix issue with editing name breaking the user profile page. It still stops working, but in a slightly nicer way. Next step: force the profile page to refresh, I suppose
workaround in place for issue with updating username and that breaking the profile page. I commented out the should_generate_new_friendly_id code in the user model. This means that the slug will not be updated along with the user's name, but it also means that changing the user's name won't break the user profile page.
added word-wrap: break-word; to #note-body so that web address in URL field would stop spilling out of container on note on ramble page
added word-wrap: break-word; to url field for notes on note search page
made note edit form a modal, formatted it