css changes
merge conflicts resolved
test
fix
Update subscription action in subscriptions controller.
Merge branch 'master' of github.com:piinthecloud/SeeMore-Aquamarine

Merge conflicts.
adds instagram auth
instagram icon
merging
added checkmark for authenticated media, and user welcome message
add partial
fix merge conflicts
new stuff
re-organze vimeo to be consistent with twitter, can search first and last names