updated include guards and changes preprend convention
Merge pull request #323 from scopatz/incs

updated include guards and changes preprend convention
Merge branch 'staging' of github.com:pyne/pyne into staging