Merge pull request #4 from fox-squirrels-2013/visitor_features

Visitor features
.
Merge pull request #6 from fox-squirrels-2013/visitor_features

.
Merge branch 'master' into visitor_features