Initial commit
Resolved conflicts from intial merge
Added environment variables for emacs and virtualenv