update to documentation, few minor fixes to code
fixed documentation conflict
Bumped up Cloud9 to 1.4.9
Added TODO.
Merge branch 'master' of https://github.com/ferhanture/Ivory into working
Merge branch 'master' into working

Conflicts:
	.classpath
	ivy/ivy.xml
Fixed warnings.
Fixed integration paths.
Merge branch 'working' into feature-extraction