Originally Posted by WarChild

I know the machine that I use at the gym, which is quite an expensive machine, measures body fat, lean muscle and water. So you can see individually where the gains or losses are.

If your diet has been consistent then water retention should just show up as a spike and will probably go down again. You did say you upped your calories quite a bit. Any chance you're getting substanially more sodium now? That will cause water retention outside the cells, or bad water weight.

Are you using a machine to do measurement by electric current or are you doing it all with calipers? Remember that fat not only stores on the body, but also stores inside the muscle between the fibres. So you can gain fat that won't be measured by calipers.