homepage map linking to discovers page, added deletion confirmation back in
merge conflict
notes placeholder working, added conditionals for api calls in discovers controller
updated ramble delete on rambles page
merge conflict
did some css code cleanup
updated delete button
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
Merge pull request #149 from dheckman/master

homepage map linking to discovers page, added deletion confirmation back in, notes placeholder working, added conditionals for api calls, updated ramble delete on rambles page
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru

Conflicts:
	app/assets/stylesheets/rambles.css.scss
changed $ to jQuery per a recommendation I saw several times, all across the ramble show code and the imtech pager js files. Inability to copy API content into note fields persists. If I comment out pagination code, it works.
removed the location scaffold as it is no longer in use
made attempt to display a no results found message for note search, did not work but I have it in there on _ramble, commented out.
adjusted links inside API results on ramble page so that they would open in a new tab
adjust font for best_in_place of ramble dates. still needs work to get rid of the letter overlapping
adjust instagram count down to 20 to alleviate issue with pagination links running outside of bounds of instagram show/hide button
Merge pull request #150 from gregburton/master

removed location scaffold, set API links to _blank, adjusted instagram count down to alleviate issue with too many pagination links, some other odds and ends
merge conflicts
changed discovers url to be discover