Reverting by hand some items so that rhings are clean for most users
Merge pull request #7 from jrossi/master

Reverting by hand some items so that things are clean for most users