I suggest you to take a look at simpleology.com. They are build on increasing productivity, and it helped me a great deal. You might learn some things there!
In general, procrastination is simply "Taking inefficient actions". There is no "doing nothing". We always do something, even if we simply sit on our butt and watch tv.
Also, unlike some here say, it has nothing to do with laziness or lack of discipline. It always depends on WHAT we have to do. For example, you need a gun pointed to my head, otherwise I'd never do bookkeeping.
On the other hand, I love to do MMA workouts until I can't move anymore. I don't need much "willpower" to do the MMA workouts, but I do need A TON for bookkeeping. This is based on my conditioning (through the environment). I value training a lot, but I hate repetitive tasks. The other side of the extreme - a friends girlfriend - loves to do bookkeeping... but she wouldn't start training MMA in a million years.
So, forget all the willpower crap. It means nothing. Everything is based on conditioning through the environment. That means, we actually have no free will, and our decisions are "guided" by the chain of causality (which are our experiences etc., every environmental influence). The best thing you can do is to adjust YOUR ENVIRONMENT to support the good habits, and abolish the bad habits. For example, if you want to eat healthier, make sure that healthy food is easily accessible and unhealthy food isn't. If you want to train, make sure you have everything you need for training in short reach, and maybe get your motivation up with a good quote or a short motivational video.
Manipulate your environment, so the environment has a good impact on you.
warm regards,
neocortx