Tweak HTML to follow Orchestra Platform Grid and Twitter Bootstrap 3.

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.0'