Updated to use teh twitter oauth stuff, minor tweaks to the formatting