Watch the S.W.A.T. Improvisation online guitar lesson by Carl Verheyen from S.W.A.T Improvisation
I can't stress enough the 5 scales patterns and your ultimate goal of learning them in all 12 keys. This is the gateway to the modes and your ability to play over complex chord progressions. I also talk about my concept of keeping a lick book and cataloging your ideas. I know everyone has a different way to approach learning the guitar, but more than anything this has been my method of choice for developing a style I can call my own. Good luck with your music!