Merge pull request #11 from wick-ed/master

removed unecessary travis configurations
Merge pull request #12 from wick-ed/master

removed non standard server vars
Merge pull request #13 from wick-ed/master

reviewed diff and tested locally with 0.6.0beta1
added tests and refactored slightly