Swapped all assertions to use a lambda. Better integration test descriptions.
Fix merge conflict
Merge pull request #273 from cs2103aug2014-w13-1c/ryan/controller

Fixed bug on keyword detection
Start and end should work now.
Merge pull request #274 from cs2103aug2014-w13-1c/jin/gui

Jin/gui
Final collated code.
The JAR