Merge pull request #1 from boneskull/master

initial merge
formatting
more formatting
updating requirements
Merge pull request #2 from boneskull/master

many unit tests, bugfixes, etc.
Merge pull request #3 from boneskull/master

ignoring some stuff for bower
fixing some syntax, tpyo