Merge pull request #22 from aguibert/master

Update upstream with package structure
I have fixed every thing!

should work now
Merge pull request #24 from jdmielke/master

I have fixed every thing!
Merge pull request #7 from BlueText/master

pull in travis's changes for October week 4