Change filenames and paths
More path changes
Update grunt
Fix stray merge token
Add dist js files
Use minified files in production
Fix test files