added twitter keys
fixed merges