Merge branch 'master' into develop

# By andrew (2) and Arturo Guzman (1)
* master:
  set scraper tag to 0.1.4
  adding point ruleset crud | closes #113
  adding markItUp class to edit post page | fixes #135
set gem file  to use master branch of kgs scraper
bundle update
Merge branch 'develop'

* develop:
  bundle update
  set gem file  to use master branch of kgs scraper