Loads of renaming
Merge branch 'master' of github.com:schmit/dictlearning into ioadmm

Conflicts:
	adapdict.py
added ioadmm