Move environment to pam_enviroment, re-add fish config files
Add progress report and use stable CM 10.1.2 release for maguro devices
Merge branch 'master' of ssh://github.com/lvillani/dotfiles

Conflicts:
	config/fish/config.fish
	pam_environment