regarding bodyweight exercises:
you can accomplish A LOT with BWE! i've found great increases in my strength and endurance througha combo of BWE and a few supplimentary compound heavy lifts(squat, deadlift, bench press, weighted pull-ups). the best part of calisthetics is that you can take them anywhere. i work nights, and when it's quiet one will often find me rattling off bootstrappers. (helps me stay awake, too!)
www.trainforstrength.com for all your BWE needs! i highly recommend it.