Add meta, analytics, & clean up code
Merge branches 'dev' and 'master'