Merge pull request #260 from bhariharan/unstable20

Use https for submodule
Removing files no longer used, updating others
Merge pull request #261 from khawkins/old_file_cleanup

Removing files no longer used, updating others
Point to the right submodule commit