Merge repairs, recursion limit in Flatten

Ironed out serious kinks in merge and expand method. Added recursion limit to flatten method. Using '][' as separator for flatten automatically wraps in data[ ]
Merge branch 'master' of https://github.com/jbielick/HashJS

Conflicts:
	hash.js