premerge
Updated cache, improved wordcloud and time plots
Merge branch 'master' of https://github.com/jnthntatum/bmi212-2014