Fixed the startup stuff finally
Tern stuff wasn't working for me anyways
Try out smex for a while
Add projectile etc
Move flx-ido-mode to init hook
Updates
Add work specific stuff
Update proxy setting
Merge branch 'work' of https://github.com/moonlite/.emacs.d into work

Conflicts:
	init.el