Adding tests and fixing some bugs for combos.
Adding a gruntfile for less compilation.