added twitter gem and controller
fixed gemlock conflict