updated my fork from the upstream master
added display() and color() getter/setters to Axis to allow easier control over appearance of an Axis
Merge pull request #68 from Stavrakakis/master

bugfixes, typos and new Axis display functionality