cleaned up bundler script
added test script to gitignore
fixed caching bug
added tn 1.6.0 as an option
Ignore test/benchmark files
Merge branch 'aries' into aries-with-icons

Conflicts:
	.gitignore
Ignore test.php