Merge pull request #1 from marcoscaceres/remove_redundant_stuff

Remove redundant stuff
bunch of renames and changes
Merge branch 'remove_redundant_stuff' of github.com:marcoscaceres/manifest into remove_redundant_stuff

* 'remove_redundant_stuff' of github.com:marcoscaceres/manifest:
  bunch of renames and changes

Conflicts:
	index.html