Work on murdering CKEDITOR.
Replace CKEDITOR with summernote
Merge branch 'master' of https://github.com/isenseDev/rSENSE into kill-ckeditor
Fix skipped test.
Fix code style.
Fixed color wheel path.
Merge remote-tracking branch 'upstream/master' into jp1549
Now using the rails path helper
Merge pull request #1552 from jaypoulz/jp1549

Fixed color wheel path.
Merge branch 'master' of https://github.com/isenseDev/rSENSE into kill-ckeditor

Conflicts:
	app/assets/stylesheets/application.css.scss
	lib/assets/javascripts/highvis/baseVis.coffee.erb
Update user test.
Give correct error message for data set creation fail
Try to debug travis.
Remove some debugging output.
Reskip an obnoxious test.
Merge pull request #1540 from NatTuck/kill-ckeditor

Kill ckeditor
Merge branch 'master' of github.com:isenseDev/rSENSE into jd_issue1541
Dev boxes should use sqlite3, not postgres.
Merge pull request #1555 from NatTuck/use-sqlite3

Dev boxes should use sqlite3, not postgres.
Merge branch 'master' of github.com:isenseDev/rSENSE into jd_issue1541