Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
increased search distance for instagram photos from 1km to 5km from specified lat-long
Merge pull request #139 from dheckman/master

reformatted datepicker, tweaked editing in place so they're not so huge, added defaults to user bio and lives in
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
tried using easyPaginate.js since there was concrete evidence that it supported multiple pagination...which would have been great had the documentation been more rubust and I'd been able to get it to work. reverted back to using imtech_pager. next step is trying to figure out how to get it to support multiple pagination
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru

Conflicts:
	app/assets/stylesheets/application.css.scss
ironed out changes due to merge conflicts being craaaazy
fixed error causing note search page not to load
Merge pull request #140 from Noahhh/master

Fixed some errors in user show page and note search page
added sort to user note show so they won't move places when updated
Merge pull request #141 from Noahhh/master

added sort to user note show so they won't move places when updated
bogged down in getting pagination to work for anything besides foursquare. I've focused my efforts on notes section. commiting where i'm att.
commit prior to pulling down
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
fixed issue with world map background on user profile page getting clipped.
Merge pull request #142 from gregburton/master

adjustment to instagram API calls, (failed) attempts at instituting multiple pagination on Ramble page with jQuery, fixed issue with map background of user profile getting severely clipped
multiple pagination progress - notes section and foursquare section are both paginated now. Next up: configure pagination on the other two sections.
increased height of note section on ramble page, did a little bit of pagination button adjustment on 4sq and notes. commented out my code that had stabilized background map on user profile page because it led to very odd behavior if user had more than one ramble. (but may revisit it later).
i don't quite remember, playing around with map, took out a few old links