cleaned up from a failed merge and twitter boostrap attempt