getting up to speed
Conflicts:
	.gitignore
Merge remote branch 'origin'

Conflicts:
	.gitignore
getting up to speed
Additional facts about cats.
Merged gitignore.
Fixed minor content error.
Fix #410 except the quote bug.
Fix travis failing hopefully.
Fix missing bytes parameter. Thanks @arlolra
Move "type" in JSON to the root object.
No idea how this got here.
OSX: fix compatibility with BSD `mkdir`.

`--parent` flag does not exist in the BSD mkdir in Mac OS X. Short `-p` is there, however.

```
$ make firefox
mkdir: illegal option -- -
usage: mkdir [-pv] [-m mode] directory ...
make: *** [firefox] Error 64
```
Merge pull request #420 from mtigas/master

OSX: fix compatibility with BSD `mkdir`.
Add a Gruntfile.
Merge pull request #422 from arlolra/252-jshint

Add a Gruntfile.
SMP UI progress (still not finished!)
More SMP UI progress (Getting there!)
Fix Travis
automerge updates