v2 merged into master

commit 46e7e6ca29142de3bf94369b2e940cedd5776ac0
Author: Noel Delgado <auhcsei@gmail.com>
Date:   Sat Oct 25 22:05:25 2014 -0500

    add / v2

commit 7540e22d95addb9c457042304e557c9bb84225d9
Author: Noel Delgado <auhcsei@gmail.com>
Date:   Fri Oct 24 20:15:43 2014 -0500

    progress / refactor
Merge branch 'master' into gh-pages

Conflicts:
	README.md
	src/sass/_mixins.scss