Master

Removed lint options which were causing problems while building