Reverting those repo path and copyright notice changes.

Signed-off-by: Jan Lindblom <jan@nyfagel.se>
Reverting change to .jshintrc by @jrolfs.
Refactoring and cleanup.
Indentation fixes and general cleanup after merge. Passes tests (only for commit so far).
Merging from develop