Merge branch 'master' into grunt-dev

fix conflicts in .gitignore and init.js to use latest master version

* master: (85 commits)
  Use continuations in ASTInterpreter for future stepping
  ASTInterpreter now handles assignments
  Fixed inlined js node interpretation
  Fixed ClassBuilder >> addSubclass:... with class migration
  Updated MethodContext class comment
  Moved MethodContext >> asString to protocol converting
  Fixed MethodContext >> asString
  Commented the (expected) failing test for now to make Travis happy
  IRClosure/IRMethod refactoring
  - Merged contexts locals and args into one object - Recompiled all .js files
  Fixed block context home contexts
  ClassCommentReader: update class comment
  REPL: recompile
  REPL.st: fix deprecation warning
  ClassCommentReader: remove unused variable 'chunkParser'
  ClassCategoryReader: remove unused variable 'chunkParser'
  A way for block context to see parent context.
  - Added MethodContext >> method - Fixed the debugger with block contexts
  - improved MethodContext >> asString - fixed block context filling - recompiled all .js files
  fillBlock() takes the args and locals as arguments
  ...

Conflicts:
	.gitignore
	js/init.js

.gitignore

@@ -16,9 +16,4 @@ test/run.js
 .svn
 
 # Ignoring local NPM modules
-node_modules
-
-# Ignoring folders - compiled versions of Amber
-# local NPM modules, tmp
-dist
-tmp
+/node_modules/*