Updated gems. Cleaned up code by extracting a few includes. Added syntax highlighting