Initial activityID refactoring. Includes new contexts as well
removed localhost and fixed conflict in readme
added in bits of missing code
initial function working, have to nail down activity ids in contexts
implemented context function for everything except videos
fixed merge conflict in functions
added context to xapipopcorn.min.js
Merge pull request #5 from ljwolford/functions

Initial activityID refactoring. Includes new contexts as well