chaning find or create by error. MERGE IMMEDIATELY
Merge branch 'master' into testing_for_feature_merge
Merge pull request #57 from devdame/testing_for_feature_merge

Testing for feature merge
changed Analyzed Post model so reference_words is a class variable to eliminate unnecessary ActiveRecord queries. Updated tests to reflect this change in functionality.
changed Keyword model so reference_words is a class variable to eliminate unnecessary ActiveRecord queries. Updated tests to reflect this change in functionality.
rake tasks explicitly set up for specific situations, added some new tasks
Merge branch 'master' into import_data
add jay's new analyzed post and reference words models
Merge pull request #58 from devdame/testing_for_feature_merge

Testing for feature merge
fix typo in rake file
fix merge conflicts but also change method names to populate_stuff instead of find_stuff
Merge pull request #59 from devdame/import_data

Import data
Include D3 gem, display additional metrics in views
Keeping code base up-to-date after including D3 gem

Merge branch 'master' into Daniel_mvp_school_view
Add logging to check for JQuery functionality