Clean Up with New Options

Plus added gemnasium badge to README