Started working on bound fns
Merge branch 'master' into testing

Conflicts:
	main.rs
Merge branch 'master' into binding

Conflicts:
	main.rs
Did some renaming for sanity
Merge branch 'master' into binding

Conflicts:
	main.rs
Merge branch 'master' into binding

Conflicts:
	main.rs
Some cleanup
Moved source files to a src dir