formatting
added marmalade repo
added some engines and tab settings
Merge branch 'master' of bitbucket.org:steveerhart/emacs-config