started working with instagram files and controller actions
comments from raph
instagram and foursquare linkages working
cleaned up testing.  added simplecov.  97.79% coverage
removed two files we ended up not using
integrated the account_settings static view as the user show page; can link accounts to fs and insta from this page
added the instagram gem and updated the poll model to refelect raf's changes
remove unused routes. flash message in users controller
fixed merge conflicts.  looks like some files we have worked on were deleted in master
add note model, merge show trip design
HOLY SHIT INSTAGRAM INTEGRATION IS WORKING
create notes for trip
added coverage to gitignore
remove coverage folder
merge master
remove duplicate account_view. cleanup auth source controller