update pkgsrc to origin/pkgsrc_2014Q1 !!!
factor out staller
Merge branch 'master' of https://github.com/ucldc/appstrap

Conflicts:
	stacks/stack_licensed
ignore .swp