Merge pull request #73 from materialsvirtuallab/master

Minor cosmetic issues
update contrib
fix six decorator as pointed out by Guido
Merge branch 'master' of github.com:materialsproject/fireworks