quick and dirty commit to get it going before i leave
Merge branch 'master' into gh-pages