Merge pull request #101 from cs2103aug2014-w13-1c/jin/gui

Minor reorganization of Keyword and Userguide components
went back to old way of keyword highlighting for now, added start and end keyword detection
Merge branch 'staging' into jin/gui