Puling in from master

from now on i'll just pus everything to gh-pages

~matthew