General cleanup of project after first meeting with Sherlock Actionbar